From 1541364cb69441dd652a891aa09fe6988e87ae3f Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 9 Oct 2023 06:34:16 +0000 Subject: [PATCH] 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 Signed-off-by: Katrin Fischer Signed-off-by: danyonsewell --- tools/scheduler.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/scheduler.pl b/tools/scheduler.pl index 9a6c9d969e..1519789b9f 100755 --- a/tools/scheduler.pl +++ b/tools/scheduler.pl @@ -27,7 +27,6 @@ use C4::Output qw( output_html_with_http_headers ); use Koha::DateUtils qw( dt_from_string output_pref );; use Koha::Reports; use Koha::Email; ->>>>>>> Bug 34349: Validate/escape inputs for task scheduler my $input = CGI->new; my $base; -- 2.39.5