Fixing the compilation failure

revert-dabc3590
Geeth Munasinghe 10 years ago
parent 2c370acfa9
commit d24030dd74

@ -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
} }

Loading…
Cancel
Save