From 07f36612d52b8f84d0ac430a565df6a4eed0def4 Mon Sep 17 00:00:00 2001 From: Paul Trowbridge Date: Wed, 7 Apr 2021 10:20:33 -0400 Subject: [PATCH] clean up missed conflict, matches dev --- build/snap_cust_pool.sql | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/snap_cust_pool.sql b/build/snap_cust_pool.sql index 8c3fd08..9a783a8 100644 --- a/build/snap_cust_pool.sql +++ b/build/snap_cust_pool.sql @@ -66,10 +66,6 @@ WHERE and c.a2 = 'MM' AND q.qr = LTRIM(RTRIM(c.a9)); -<<<<<<< HEAD - -COMMIT; -======= COMMIT; --ROLLBACK; >>>>>>> dev