Fixed merge issue

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

@@ -589,23 +589,6 @@ ORDER BY TENANT_ID, DEVICE_ID;
 
 -- END OF DASHBOARD RELATED VIEWS --
 
-<<<<<<< HEAD
-
-
 SELECT feom.DEVICE_IDENTIFICATION, feom.DEVICE_TYPE, or.OPERATION_RESPONSE, feom.CREATED_TIMESTAMP
 FROM DM_DEVICE_OPERATION_RESPONSE dor, (SELECT eom.OPERATION_ID, fe.DEVICE_IDENTIFICATION, fe.DEVICE_TYPE, fe.ENROLMENT_ID, eom.CREATED_TIMESTAMP, eom.UPDATED_TIMESTAMP, or.RECEIVED_TIMESTAMP FROM DM_ENROLMENT_OP_MAPPING eom, (SELECT e.ID AS ENROLMENT_ID, fd.DEVICE_ID, fd.DEVICE_IDENTIFICATION, fd.DEVICE_TYPE FROM DM_ENROLMENT e, (SELECT DISTINCT d.ID AS DEVICE_ID, d.DEVICE_IDENTIFICATION, t.NAME AS DEVICE_TYPE FROM DM_DEVICE d, DM_DEVICE_TYPE t WHERE d.DEVICE_TYPE_ID = t.ID AND d.TENANT_ID = -1234) fd WHERE e.DEVICE_ID = fd.DEVICE_ID AND e.TENANT_ID = -1234) fe WHERE eom.ENROLMENT_ID = fe.ENROLMENT_ID) feom WHERE or.OPERATION_ID = or.OPERATION_ID;
-=======
--- CERTIFICATES TABLES --
-
-CREATE TABLE IF NOT EXISTS DM_DEVICE_CERTIFICATE (
-      ID                    INTEGER auto_increment NOT NULL,
-      SERIAL_NUMBER            VARCHAR(500) DEFAULT NULL,
-    	CERTIFICATE                  BLOB DEFAULT NULL,
-    	TENANT_ID INTEGER DEFAULT 0,
-    	USERNAME  VARCHAR(500) DEFAULT NULL,
-    	PRIMARY KEY (ID)
-)ENGINE = InnoDB;
-
--- END CERTIFICATES TABLES --
 
->>>>>>> c01db9c773d5e87f5769495d62e15fa758c79ba0