From 216a8f1d0301093d7bd90c1a13d10ebd03d23d6b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 9 Oct 2018 14:08:33 -0300 Subject: [PATCH] Bug 11897: (follow-up) Add Stock Rotation atomic update schema Remove the duplicate entry for RoutingListAddReserves I guess it has been caused by a bad merge resolution conflict Signed-off-by: Nick Clemens --- installer/data/mysql/sysprefs.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 264f49d865..0f86627024 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -487,7 +487,6 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('RisExportAdditionalFields', '', NULL , 'Define additional RIS tags to export from MARC records in YAML format as an associative array with either a marc tag/subfield combination as the value, or a list of tag/subfield combinations.', 'textarea'), ('RoutingListAddReserves','0','','If ON the patrons on routing lists are automatically added to holds on the issue.','YesNo'), ('RotationPreventTransfers','0',NULL,'If ON, prevent any transfers for items on stock rotation rotas, except for stock rotation transfers','YesNo'), -('RoutingListAddReserves','1','','If ON the patrons on routing lists are automatically added to holds on the issue.','YesNo'), ('RoutingListNote','To change this note edit RoutingListNote system preference.','70|10','Define a note to be shown on all routing lists','Textarea'), ('RoutingSerials','1',NULL,'If ON, serials routing is enabled','YesNo'), ('SCOMainUserBlock','','70|10','Add a block of HTML that will display on the self checkout screen','Textarea'), -- 2.20.1