[open-ils-commits] [GIT] Evergreen ILS branch master updated. 71a8adacf6a4711b0682e010ca275a9d1f2e85f8

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  71a8adacf6a4711b0682e010ca275a9d1f2e85f8 (commit)
      from  5e4304589abce95735bd6c9e277a93baad443c4d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 71a8adacf6a4711b0682e010ca275a9d1f2e85f8
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Aug 9 10:10:23 2019 -0400

    fix bad conflict resolution made merging LP#1825851
    
    Signed-off-by: Galen Charlton <gmc at 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 (

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/950.data.seed-values.sql | 10 ----------
 1 file changed, 10 deletions(-)


hooks/post-receive
-- 
Evergreen ILS