From 71a8adacf6a4711b0682e010ca275a9d1f2e85f8 Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Fri, 9 Aug 2019 10:10:23 -0400 Subject: [PATCH] fix bad conflict resolution made merging LP#1825851 Signed-off-by: Galen Charlton --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 17c59a99a2..4d9d37615c 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -20044,16 +20044,6 @@ VALUES ( ) ); -INSERT INTO config.workstation_setting_type - (name, grp, datatype, label) -VALUES ( - 'eg.grid.circ.patron.group_members', 'gui', 'object', - oils_i18n_gettext( - 'eg.grid.circ.patron.group_members', - 'Grid Config: circ.patron.group_members', - 'cwst', 'label') -); - INSERT INTO config.print_template (id, name, locale, active, owner, label, template) VALUES ( -- 2.11.0