aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-01-25 14:15:59 +0100
committerLukas Larsson <[email protected]>2019-01-25 14:15:59 +0100
commit0bb760dfbcfc9969788a9073aaaca961880d9fc1 (patch)
tree6be69371b6933afe754a5c4af092b353e4f1f7cd
parentecbfc52f06a71ed553a5986c6a13bc893586615b (diff)
downloadotp-0bb760dfbcfc9969788a9073aaaca961880d9fc1.tar.gz
otp-0bb760dfbcfc9969788a9073aaaca961880d9fc1.tar.bz2
otp-0bb760dfbcfc9969788a9073aaaca961880d9fc1.zip
Update version-check of forward merging script
-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 1e8b314962..7f8f011eb7 100644
--- a/make/otp_patch_solve_forward_merge_version
+++ b/make/otp_patch_solve_forward_merge_version
@@ -1 +1 @@
-6
+7