From: Bill Erickson <berick@esilibrary.com>
Date: Thu, 9 Jun 2011 17:29:35 +0000 (-0400)
Subject: repaired seed data merge conflict
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=945146dbbb036c642bbba2738d90ad84774cb50f;p=evergreen%2Fequinox.git

repaired seed data merge conflict
---

945146dbbb036c642bbba2738d90ad84774cb50f
diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index a5b4d58f8a,e07160a3a1..dfcad43d99
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@@ -9290,3 -8711,20 +9293,19 @@@ INSERT INTO config.usr_setting_typ
    'bool'
  );
  
+ INSERT INTO config.org_unit_setting_type ( name, label, description, datatype ) VALUES (
+     'circ.transit.min_checkin_interval',
+     oils_i18n_gettext( 
+         'circ.transit.min_checkin_interval', 
+         'Circ:  Minimum Transit Checkin Interval',
+         'coust',
+         'label'
+     ),
+     oils_i18n_gettext( 
+         'circ.transit.min_checkin_interval', 
+         'In-Transit items checked in this close to the transit start time will be prevented from checking in',
+         'coust',
+         'label'
+     ),
+     'interval'
+ );
 -