diff options
| author | Rickard Green <rickard@erlang.org> | 2020-03-24 16:42:51 +0100 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2020-03-24 16:42:51 +0100 |
| commit | fc5f6a945304f17d52117506f9059207c5029117 (patch) | |
| tree | 3efe1e13590f7ad172625ba6b9d99687bbc0d33a /make | |
| parent | 79852fc8f6af064d30dc1a68462faa09fe9cc341 (diff) | |
| parent | b8d63e1d3bdaea08ee45436f1c7d926c8e3969c3 (diff) | |
| download | erlang-fc5f6a945304f17d52117506f9059207c5029117.tar.gz | |
Merge branch 'maint'
* maint:
Bump patch merge version
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 b1bd38b62a..8351c19397 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -13 +14 |