diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/otp_patch_solve_forward_merge_version | 2 | ||||
| -rw-r--r-- | make/otp_version_tickets | 5 | ||||
| -rw-r--r-- | make/otp_version_tickets_in_merge | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/make/otp_patch_solve_forward_merge_version b/make/otp_patch_solve_forward_merge_version index 7ed6ff82de..1e8b314962 100644 --- a/make/otp_patch_solve_forward_merge_version +++ b/make/otp_patch_solve_forward_merge_version @@ -1 +1 @@ -5 +6 diff --git a/make/otp_version_tickets b/make/otp_version_tickets index 4e6277bc58..b8220e1a87 100644 --- a/make/otp_version_tickets +++ b/make/otp_version_tickets @@ -1,4 +1 @@ -OTP-15536 -OTP-15537 -OTP-15538 -OTP-15544 +DEVELOPMENT diff --git a/make/otp_version_tickets_in_merge b/make/otp_version_tickets_in_merge new file mode 100644 index 0000000000..4e6277bc58 --- /dev/null +++ b/make/otp_version_tickets_in_merge @@ -0,0 +1,4 @@ +OTP-15536 +OTP-15537 +OTP-15538 +OTP-15544 |