Bugzilla – Attachment 156770 Details for
Bug 35009
[21.11] tools/scheduler.pl contains merge markers
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 35009: Remove merge conflict markers from tools/scheduler.pl
Bug-35009-Remove-merge-conflict-markers-from-tools.patch (text/plain), 950 bytes, created by
Katrin Fischer
on 2023-10-09 21:11:27 UTC
(
hide
)
Description:
Bug 35009: Remove merge conflict markers from tools/scheduler.pl
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-10-09 21:11:27 UTC
Size:
950 bytes
patch
obsolete
>From 0aaa0bac11d48661917f72e62f01f5981974d660 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >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 <jonathan.druart@bugs.koha-community.org> >Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> >--- > 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.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 35009
:
156721
|
156722
| 156770