From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 1 Feb 2010 21:25:33 +0000 (+0000)
Subject: forward porting r15420: add overlooked MERGE_USERS permission
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=3d817d2d406a2f8db7740e9456b7e87cac2b89de;p=evergreen%2Fpines.git

forward porting r15420: add overlooked MERGE_USERS permission

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15422 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

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 4c7b9e79d2..f2e1038ba7 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -1251,7 +1251,8 @@ INSERT INTO permission.perm_list VALUES
     (358, 'ADMIN_BOOKING_RESERVATION_ATTR_VALUE_MAP', oils_i18n_gettext(358, 'Enables the user to create/update/delete booking reservation attribute value maps', 'ppl', 'description')),
     (359, 'HOLD_ITEM_CHECKED_OUT.override', oils_i18n_gettext(359, 'Allows a user to place a hold on an item that they already have checked out', 'ppl', 'description')),
     (360, 'RETRIEVE_RESERVATION_PULL_LIST', oils_i18n_gettext(360, 'Allows a user to retrieve a booking reservation pull list', 'ppl', 'description')),
-    (361, 'CAPTURE_RESERVATION', oils_i18n_gettext(361, 'Allows a user to capture booking reservations', 'ppl', 'description'))
+    (361, 'CAPTURE_RESERVATION', oils_i18n_gettext(361, 'Allows a user to capture booking reservations', 'ppl', 'description')),
+    (362, 'MERGE_USERS', oils_i18n_gettext(361, 'Allows user records to be merged', 'ppl', 'description'))
 ;
 
 SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000);