From c828621a1e49c4884e6e1fdfffe1c8e54c8abdf4 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Tue, 10 Nov 2020 09:36:26 +1300 Subject: [PATCH] Bug 19532: (follow-up) Remove bad merge conflict markers Signed-off-by: David Nind --- admin/smart-rules.pl | 1 - 1 file changed, 1 deletion(-) diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl index d203ca3a44..0f78cd49b9 100755 --- a/admin/smart-rules.pl +++ b/admin/smart-rules.pl @@ -343,7 +343,6 @@ elsif ($op eq 'add') { recall_due_date_interval => $recall_due_date_interval, recall_overdue_fine => $recall_overdue_fine, recall_shelf_time => $recall_shelf_time, ->>>>>>> Bug 19532: Database and installer stuff }; Koha::CirculationRules->set_rules( -- 2.11.0