aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2019-04-18 13:52:26 +0200
committerRaimo Niskanen <[email protected]>2019-04-18 13:52:26 +0200
commit9764c554546e6edbbf1b3ddbf68298f8f8fdec82 (patch)
treef20be9dd517a29e5e5b07cece7924c3d87be9056
parent57905f018f7710ce8951bda2dc24cd4f87c8e488 (diff)
parent4f6115e0027691c508562973398bc76a6f6944fd (diff)
downloadotp-9764c554546e6edbbf1b3ddbf68298f8f8fdec82.tar.gz
otp-9764c554546e6edbbf1b3ddbf68298f8f8fdec82.tar.bz2
otp-9764c554546e6edbbf1b3ddbf68298f8f8fdec82.zip
Merge branch 'maint'
* maint: Bump otp_patch_solve_forward_merge_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 45a4fb75db..ec635144f6 100644
--- a/make/otp_patch_solve_forward_merge_version
+++ b/make/otp_patch_solve_forward_merge_version
@@ -1 +1 @@
-8
+9