aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2019-05-09 11:02:10 +0200
committerRickard Green <[email protected]>2019-05-09 11:02:10 +0200
commit601316f55895a683e51680c40b9d6f661999e528 (patch)
treedaab44fcfd98d05e95a8d403d3d18ed0fe3620d4
parentb4037b963258b45b62a3bf3dbbdaf3ef7fd06c9c (diff)
parent1637d49f6bd623eda46f521f04ec2c2a76885956 (diff)
downloadotp-601316f55895a683e51680c40b9d6f661999e528.tar.gz
otp-601316f55895a683e51680c40b9d6f661999e528.tar.bz2
otp-601316f55895a683e51680c40b9d6f661999e528.zip
Merge branch 'maint'
* maint: Bump forward merge script version
-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 ec635144f6..f599e28b8a 100644
--- a/make/otp_patch_solve_forward_merge_version
+++ b/make/otp_patch_solve_forward_merge_version
@@ -1 +1 @@
-9
+10