Fixing the compilation failure

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManagerService.java

@@ -75,19 +75,15 @@ public class AndroidDeviceManagerService implements DeviceManagerService {
         return null;
     }
 
-<<<<<<< HEAD
     @Override
     public void setOwnership(DeviceIdentifier deviceId, String ownershipType) throws DeviceManagementException {
 
     }
-=======
+
 	@Override
 	public void updateDeviceInfo(Device device) throws DeviceManagementException{
 
 	}
 
-	@Override
-	public void setOwnership(String ownershipType) throws DeviceManagementException {
->>>>>>> cc9417d8eba5a0e432e8cc9c87f3e4b64951e520
 
 }