https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35009 Bug ID: 35009 Summary: [21.11] tools/scheduler.pl contains merge markers Change sponsored?: --- Product: Koha Version: 21.11 Hardware: All OS: All Status: NEW Severity: blocker Priority: P5 - low Component: Tools Assignee: koha-bugs@lists.koha-community.org Reporter: aleisha@catalyst.net.nz QA Contact: testopia@bugs.koha-community.org # Failed test 'Files should not contain merge markers (./blib/INTRANET_CGI_DIR/tools/scheduler.pl, ./tools/scheduler.pl )' # at t/00-merge-conflict-markers.t line 52. # got: '2' # expected: '0' # Looks like you failed 1 test of 1. t/00-merge-conflict-markers.t ............... 1..1 not ok 1 - Files should not contain merge markers (./blib/INTRANET_CGI_DIR/tools/scheduler.pl, ./tools/scheduler.pl ) Only valid in 21.11 -- You are receiving this mail because: You are the assignee for the bug. You are watching all bug changes.