community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 27 Packages Projects Releases Wiki Activity

deviceOrg:resolve merge conflicts

Browse Source
pull/238/head
Isuri Mendis 10 months ago
parent f5250abe78 680cc7bca8
commit 127c23ff01
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File

1
features/device-mgt/io.entgra.device.mgt.core.device.mgt.basics.feature/src/main/resources/dbscripts/cdm/oracle.sql
Unescape View File

@ -1195,7 +1195,6 @@ CREATE SEQUENCE SUB_OPERATION_TEMPLATE_seq START WITH 1 INCREMENT BY 1;
/ /
-- END OF SUB_OPERATION_TEMPLATE TABLE-- -- END OF SUB_OPERATION_TEMPLATE TABLE--
<<<<<<< HEAD
-- DM_DEVICE_ORGANIZATION TABLE-- -- DM_DEVICE_ORGANIZATION TABLE--
CREATE TABLE IF NOT EXISTS DM_DEVICE_ORGANIZATION ( CREATE TABLE IF NOT EXISTS DM_DEVICE_ORGANIZATION (
ORGANIZATION_ID NUMBER(10) NOT NULL, ORGANIZATION_ID NUMBER(10) NOT NULL,

Write Preview
Loading…
Cancel
Save