From 2c370acfa957dbe48294926499ede0b3a75518d6 Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Fri, 5 Dec 2014 15:09:21 +0530 Subject: [PATCH] Fixing the compilation failure --- .../mobile/impl/android/AndroidDeviceManagerService.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManagerService.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManagerService.java index 9ed1251ebd..e3965b7e2c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidDeviceManagerService.java +++ b/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 }