community/device-mgt-plugins
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-plugins.git synced 2025-09-16 23:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing the compilation failure

Browse Source
This commit is contained in:
Geeth Munasinghe 2014-12-05 15:10:52 +05:30
parent 2c370acfa9
commit d24030dd74
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/ios/IOSDeviceManagerService.java
View File

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