aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2019-01-18 19:20:35 +0100
committerSverker Eriksson <[email protected]>2019-01-18 19:20:35 +0100
commita11ddd5862fa06a3242e548fbd232a4c294ca7a8 (patch)
treeda015b03b9054e8ab49c26930cbf5dfbbadfb280
parentcf334a67dbda6f51a09f58eebf856408463c11a5 (diff)
parent208cb776d07b4f6d3f7fedc6a18bf6ae379078ad (diff)
downloadotp-a11ddd5862fa06a3242e548fbd232a4c294ca7a8.tar.gz
otp-a11ddd5862fa06a3242e548fbd232a4c294ca7a8.tar.bz2
otp-a11ddd5862fa06a3242e548fbd232a4c294ca7a8.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 7ed6ff82de..1e8b314962 100644
--- a/make/otp_patch_solve_forward_merge_version
+++ b/make/otp_patch_solve_forward_merge_version
@@ -1 +1 @@
-5
+6