repaired seed data merge conflict

diff --cc Open-ILS/src/sql/Pg/002.schema.config.sql
Simple merge

diff --cc Open-ILS/src/sql/Pg/950.data.seed-values.sql
index a5b4d58,e07160a..dfcad43
--- 1/Open-ILS/src/sql/Pg/950.data.seed-values.sql
--- 2/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'
+ );

diff --cc Open-ILS/xul/staff_client/chrome/content/main/menu.js
Simple merge