diff options
| author | Rickard Green <[email protected]> | 2019-05-14 23:40:48 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-05-14 23:40:48 +0200 |
| commit | cfe6c44ad6e29d92d6bad8c9adc072c093ee9db8 (patch) | |
| tree | 2e6120d5cc39e8d027c8c05322a309d121223dc6 | |
| parent | 7ed4440e3aacb592b7f7303968714de858250fa9 (diff) | |
| parent | cd29130a86e77108e75e770afea5952f47167067 (diff) | |
| download | otp-cfe6c44ad6e29d92d6bad8c9adc072c093ee9db8.tar.gz otp-cfe6c44ad6e29d92d6bad8c9adc072c093ee9db8.tar.bz2 otp-cfe6c44ad6e29d92d6bad8c9adc072c093ee9db8.zip | |
Merge branch 'maint'
* maint:
Bump patch merge version
| -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 f599e28b8a..b4de394767 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -10 +11 |