From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Fri, 9 Aug 2019 14:10:23 +0000 (-0400)
Subject: fix bad conflict resolution made merging LP#1825851
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=71a8adacf6a4711b0682e010ca275a9d1f2e85f8;p=evergreen%2Ftadl.git

fix bad conflict resolution made merging LP#1825851

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

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 (