Fixed merge conflicts

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/FeatureManager.java

@@ -24,10 +24,14 @@ public interface FeatureManager {
 
     boolean addFeature(Feature feature) throws DeviceManagementException;
 
+    boolean addFeatures(List<Feature> features) throws DeviceManagementException;
+
     Feature getFeature(String name) throws DeviceManagementException;
 
     List<Feature> getFeatures() throws DeviceManagementException;
 
     boolean removeFeature(String name) throws DeviceManagementException;
 
+    boolean addSupportedFeaturesToDB() throws DeviceManagementException;
+
 }

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

@@ -1,5 +1,5 @@
 CREATE TABLE DM_DEVICE_TYPE (
-     ID   INT identity NOT NULL,
+     ID INT IDENTITY NOT NULL,
      NAME VARCHAR(300) DEFAULT NULL,
      PRIMARY KEY (ID)
 );
@@ -404,3 +404,4 @@ CREATE TABLE DM_NOTIFICATION (
 -- TO:DO - Remove this INSERT sql statement.
 Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
 Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
+

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

@@ -399,3 +399,4 @@ CREATE TABLE IF NOT EXISTS DM_NOTIFICATION (
 -- TO:DO - Remove this INSERT sql statement.
 Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
 Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
+

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

@@ -1,5 +1,5 @@
 CREATE TABLE DM_DEVICE_TYPE (
-     ID   NUMBER(10) NOT NULL,
+     ID NUMBER(10) NOT NULL,
      NAME VARCHAR2(300) DEFAULT NULL,
      PRIMARY KEY (ID)
 );
@@ -630,3 +630,4 @@ END;
 -- TO:DO - Remove this INSERT sql statement.
 Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (1, 'android');
 Insert into DM_DEVICE_TYPE (ID,NAME) VALUES (2, 'ios');
+