clean up missed conflict, matches dev

2021-04-07 10:20:33 -04:00 · 2021-04-07 10:20:33 -04:00 · 07f36612d5
commit 07f36612d5
parent e4604a16f5
1 changed files with 0 additions and 4 deletions
--- 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