From ea51e69908db75b38b2e660d272776de586f058e Mon Sep 17 00:00:00 2001
From: Aleisha Amohia <aleishaamohia@hotmail.com>
Date: Tue, 10 Nov 2020 09:36:26 +1300
Subject: [PATCH] Bug 19532: (follow-up) Remove bad merge conflict markers

---
 admin/smart-rules.pl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl
index ccb26e027f..0d730ad548 100755
--- a/admin/smart-rules.pl
+++ b/admin/smart-rules.pl
@@ -340,7 +340,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