diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_patch_solve_forward_merge_version | 2 | ||||
| -rw-r--r-- | make/otp_version_tickets | 2 | ||||
| -rw-r--r-- | make/otp_version_tickets_in_merge | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/make/otp_patch_solve_forward_merge_version b/make/otp_patch_solve_forward_merge_version index 7ed6ff82de..7f8f011eb7 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -5 +7 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 921f8b53fe..b8220e1a87 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1 +1 @@ -OTP-15554 +DEVELOPMENT diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge new file mode 100644 index 0000000000..921f8b53fe --- /dev/null +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1 @@ +OTP-15554 |