diff options
| author | Rickard Green <[email protected]> | 2019-03-21 20:56:46 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-03-21 20:56:46 +0100 |
| commit | d015f4819d14694fe81b0ddb5935d14c80898ccc (patch) | |
| tree | 97ddcbd5d999b7638fc84d0fc74f5759434bd825 /make | |
| parent | 7b7dbb84cb5047daa2cce52cfcf7aa7ba75ad9a6 (diff) | |
| parent | c603b7caf63e390b4bc03527cf34ede38bf6a112 (diff) | |
| download | otp-d015f4819d14694fe81b0ddb5935d14c80898ccc.tar.gz otp-d015f4819d14694fe81b0ddb5935d14c80898ccc.tar.bz2 otp-d015f4819d14694fe81b0ddb5935d14c80898ccc.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 7f8f011eb7..45a4fb75db 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -7 +8 |