pt/forecast_api
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean up missed conflict, matches dev

Browse Source
This commit is contained in:
Paul Trowbridge 2021-04-07 10:20:33 -04:00
parent e4604a16f5
commit 07f36612d5
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/snap_cust_pool.sql
View File

@ -66,10 +66,6 @@ WHERE
and c.a2 = 'MM' and c.a2 = 'MM'
AND q.qr = LTRIM(RTRIM(c.a9)); AND q.qr = LTRIM(RTRIM(c.a9));
<<<<<<< HEAD
COMMIT;
=======
COMMIT; COMMIT;
--ROLLBACK; --ROLLBACK;
>>>>>>> dev >>>>>>> dev