From 1f484e6a5314fb8bca9233c729fd13c79c892d4e Mon Sep 17 00:00:00 2001 From: Nirothipan Date: Wed, 18 Oct 2017 14:31:12 +0530 Subject: [PATCH] resolving conflicts --- .../android/services/impl/DeviceManagementAdminServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java index 176dbc232..b50e4b4ad 100644 --- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java +++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/DeviceManagementAdminServiceImpl.java @@ -316,7 +316,7 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe public Response getDeviceLogcat(List deviceIDs) { if (log.isDebugEnabled()) { log.debug("Invoking get Android device logcat operation"); - }g + } try { CommandOperation operation = new CommandOperation();