From 7b30fc964235af7f341ebe642785afffd1a1996b Mon Sep 17 00:00:00 2001 From: Geeth Munasinghe Date: Fri, 5 Dec 2014 13:49:01 +0530 Subject: [PATCH] Fixing mobile implementations --- .../mobile/impl/windows/WindowsDeviceManagerService.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManagerService.java b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManagerService.java index 9f6410c56..bebeb972e 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManagerService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManagerService.java @@ -75,19 +75,15 @@ public class WindowsDeviceManagerService 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 - }