Resolving more conflicts

revert-70aa11f8
prabathabey 9 years ago
commit 5d0c706bca

@ -400,4 +400,3 @@ CREATE TABLE DM_NOTIFICATION (
DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
);
-- NOTIFICATION TABLE END --

@ -337,4 +337,4 @@ CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
DM_OPERATION (ID) ON DELETE NO ACTION ON UPDATE NO ACTION
);
-- NOTIFICATION TABLE END --
-- NOTIFICATION TABLE END --

Loading…
Cancel
Save