[Koha-bugs] [Bug 35009] [21.11] tools/scheduler.pl contains merge markers

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35009

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
 Attachment #156722|0                           |1
        is obsolete|                            |

--- Comment #4 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Created attachment 156770
  -->
https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=156770&action=edit
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 at bugs.koha-community.org>
Signed-off-by: Katrin Fischer <katrin.fischer.83 at web.de>

-- 
You are receiving this mail because:
You are watching all bug changes.