diff options
| author | Rickard Green <[email protected]> | 2018-10-23 16:38:32 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-10-23 16:38:32 +0200 |
| commit | 6ee89323550defedc56cdbf5e0dbcd1e88762b0d (patch) | |
| tree | e555a7685cbe4a5a2b36a711185452f401ad20ba /make | |
| parent | e9f1addd0650f7a790a2cefb8fc13e234aae1535 (diff) | |
| parent | d8041814f6969508d0e00282573df78f782a613d (diff) | |
| download | otp-6ee89323550defedc56cdbf5e0dbcd1e88762b0d.tar.gz otp-6ee89323550defedc56cdbf5e0dbcd1e88762b0d.tar.bz2 otp-6ee89323550defedc56cdbf5e0dbcd1e88762b0d.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 00750edc07..b8626c4cff 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -3 +4 |