diff options
| author | Lukas Larsson <[email protected]> | 2019-01-25 14:16:06 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2019-01-25 14:16:06 +0100 |
| commit | 6fe596c68b0b7c5df6b2dff83747c279b9c7e884 (patch) | |
| tree | cba2bf6b672f2e138b68b81e38f65d2ea2e28aff /make | |
| parent | d6d493ab1d9131e5a5ccb6a73cd65da39447ebf0 (diff) | |
| parent | 0bb760dfbcfc9969788a9073aaaca961880d9fc1 (diff) | |
| download | otp-6fe596c68b0b7c5df6b2dff83747c279b9c7e884.tar.gz otp-6fe596c68b0b7c5df6b2dff83747c279b9c7e884.tar.bz2 otp-6fe596c68b0b7c5df6b2dff83747c279b9c7e884.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 1e8b314962..7f8f011eb7 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -6 +7 |