| Summary: | [21.11] tools/scheduler.pl contains merge markers | ||
|---|---|---|---|
| Product: | Koha | Reporter: | Aleisha Amohia <aleisha> |
| Component: | Tools | Assignee: | Aleisha Amohia <aleisha> |
| Status: | CLOSED FIXED | QA Contact: | Katrin Fischer <katrin.fischer> |
| Severity: | blocker | ||
| Priority: | P5 - low | CC: | danyonsewell, fridolin.somers, jonathan.druart |
| Version: | 21.11 | Keywords: | rel_21_11_candidate |
| Hardware: | All | ||
| OS: | All | ||
| GIT URL: | Initiative type: | --- | |
| Sponsorship status: | Sponsored | Crowdfunding goal: | 0 |
| Patch complexity: | Small patch | Documentation contact: | |
| Documentation submission: | Text to go in the release notes: | ||
| Version(s) released in: |
21.11.25
|
Circulation function: | |
| Bug Depends on: | 34349 | ||
| Bug Blocks: | |||
| Attachments: |
Bug 35009: Remove merge conflict markers from tools/scheduler.pl
Bug 35009: Remove merge conflict markers from tools/scheduler.pl Bug 35009: Remove merge conflict markers from tools/scheduler.pl |
||
|
Description
Aleisha Amohia
2023-10-09 06:26:17 UTC
Created attachment 156721 [details] [review] Bug 35009: Remove merge conflict markers from tools/scheduler.pl To test: Confirm tests pass with patch applied t/00-merge-conflict-markers.t Sponsored-by: Catalyst IT Created attachment 156722 [details] [review] Bug 35009: Remove merge conflict markers from tools/scheduler.pl To test: Confirm tests pass with patch applied t/00-merge-conflict-markers.t Sponsored-by: Catalyst IT Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> This should not happen. We have the QA script and a unit test to catch them before the release. Created attachment 156770 [details] [review] Bug 35009: Remove merge conflict markers from tools/scheduler.pl To test: Confirm tests pass with patch applied t/00-merge-conflict-markers.t Sponsored-by: Catalyst IT Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Have pushed this patch to 21.11.x branch ready for next release Resolved ? |