From 9ae83f50b3e7c68bc0bfb9a8d0bb356e08cfdc7d Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Mon, 29 Nov 2021 10:03:17 -0500 Subject: [PATCH] LP1929741: bump up ID for new config.print_template inserts Resolving a logical merge conflict. Signed-off-by: Galen Charlton --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 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 096cca79d3..2e7f0e688d 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -22244,7 +22244,7 @@ VALUES ( INSERT INTO config.print_template (id, name, label, owner, active, locale, template) VALUES ( - 4, 'lineitem_worksheet', 'Lineitem Worksheet', 1, TRUE, 'en-US', + 5, 'lineitem_worksheet', 'Lineitem Worksheet', 1, TRUE, 'en-US', $TEMPLATE$ [%- USE money=format('%.2f'); @@ -22274,7 +22274,7 @@ $TEMPLATE$ INSERT INTO config.print_template (id, name, label, owner, active, locale, template) -VALUES (5, 'purchase_order', 'Purchase Order', 1, TRUE, 'en-US', +VALUES (6, 'purchase_order', 'Purchase Order', 1, TRUE, 'en-US', $TEMPLATE$ [%- -- 2.11.0