]> git.koha-community.org Git - koha.git/commit
projects / koha.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c007760) | patch
Bug 35009: Remove merge conflict markers from tools/scheduler.pl
authorAleisha Amohia <aleishaamohia@hotmail.com>
Mon, 9 Oct 2023 06:34:16 +0000 (06:34 +0000)
committerdanyonsewell <danyonsewell@catalyst.net.nz>
Mon, 9 Oct 2023 22:11:09 +0000 (22:11 +0000)
commit1541364cb69441dd652a891aa09fe6988e87ae3f
treed7b2d2d27b348c268a98f61b05db5bfaa422992ctree | snapshot
parentc0077606ea03fba3d388b23fffa6c63eb9e88e46commit | diff
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>
Signed-off-by: danyonsewell <danyonsewell@catalyst.net.nz>
tools/scheduler.pl diff | blob | history
Main Koha release repository