aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-03-21 20:56:46 +0100
committerRickard Green <[email protected]>2019-03-21 20:56:46 +0100
commitd015f4819d14694fe81b0ddb5935d14c80898ccc (patch)
tree97ddcbd5d999b7638fc84d0fc74f5759434bd825
parent7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6 (diff)
parentc603b7caf63e390b4bc03527cf34ede38bf6a112 (diff)
downloadotp-d015f4819d14694fe81b0ddb5935d14c80898ccc.tar.gz
otp-d015f4819d14694fe81b0ddb5935d14c80898ccc.tar.bz2
otp-d015f4819d14694fe81b0ddb5935d14c80898ccc.zip
Merge branch 'maint'
-rw-r--r--make/otp_patch_solve_forward_merge_version2
1 files changed, 1 insertions, 1 deletions
diff --git a/make/otp_patch_solve_forward_merge_version b/make/otp_patch_solve_forward_merge_version
index 7f8f011eb7..45a4fb75db 100644
--- a/make/otp_patch_solve_forward_merge_version
+++ b/make/otp_patch_solve_forward_merge_version
@@ -1 +1 @@
-7
+8