diff options
| author | Sverker Eriksson <[email protected]> | 2019-01-18 19:20:35 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2019-01-18 19:20:35 +0100 |
| commit | a11ddd5862fa06a3242e548fbd232a4c294ca7a8 (patch) | |
| tree | da015b03b9054e8ab49c26930cbf5dfbbadfb280 /make | |
| parent | cf334a67dbda6f51a09f58eebf856408463c11a5 (diff) | |
| parent | 208cb776d07b4f6d3f7fedc6a18bf6ae379078ad (diff) | |
| download | otp-a11ddd5862fa06a3242e548fbd232a4c294ca7a8.tar.gz otp-a11ddd5862fa06a3242e548fbd232a4c294ca7a8.tar.bz2 otp-a11ddd5862fa06a3242e548fbd232a4c294ca7a8.zip | |
Merge branch 'maint'
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_patch_solve_forward_merge_version | 2 |
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 |