Resolving more conflicts

9 years ago · 5d0c706bca
parent 90240e7d3f 27f293b09f
commit 5d0c706bca
2 changed files with 1 additions and 2 deletions
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/mssql.sql
+++ b/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 --
-
--- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/dbscripts/cdm/postgresql.sql
+++ b/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 --