deviceOrg:resolve merge conflicts

10 months ago · 127c23ff01
parent f5250abe78 680cc7bca8
commit 127c23ff01
1 changed files with 0 additions and 1 deletions
--- a/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
+++ b/features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
@ -1195,7 +1195,6 @@ CREATE SEQUENCE SUB_OPERATION_TEMPLATE_seq START WITH 1 INCREMENT BY 1;
 /
 -- END OF SUB_OPERATION_TEMPLATE TABLE--

-<<<<<<< HEAD
 -- DM_DEVICE_ORGANIZATION TABLE--
 CREATE TABLE IF NOT EXISTS DM_DEVICE_ORGANIZATION (
    ORGANIZATION_ID NUMBER(10) NOT NULL,