clean up missed conflict, matches dev
This commit is contained in:
parent
07f36612d5
commit
6e4e64b3a4
@ -68,4 +68,3 @@ WHERE
|
||||
|
||||
COMMIT;
|
||||
--ROLLBACK;
|
||||
>>>>>>> dev
|
||||
|
Loading…
Reference in New Issue
Block a user