clean up missed conflict, matches dev

This commit is contained in:
Paul Trowbridge 2021-04-07 10:20:55 -04:00
parent 07f36612d5
commit 6e4e64b3a4

View File

@ -68,4 +68,3 @@ WHERE
COMMIT; COMMIT;
--ROLLBACK; --ROLLBACK;
>>>>>>> dev