Resolving more conflicts

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql

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

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql

@@ -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 --