fix(deeplink): savoid rewrite mqtt information

Signed-off-by: Rafa Hernandez <[email protected]>
flyve-mdm · Oct 3, 2018 · 2764ab0 · 2764ab0
1 parent 8fc2f08
commit 2764ab0
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/app/src/main/java/org/flyve/mdm/agent/utils/Helpers.java b/app/src/main/java/org/flyve/mdm/agent/utils/Helpers.java
@@ -113,11 +113,8 @@ public static void installApk(Context context, String id, String appPath) {
 
 				appName = packageManager.getApplicationLabel(packageInfo.applicationInfo).toString();
 				appPackage = packageInfo.packageName;
-<<<<<<< HEAD
 				appVersionCode = String.valueOf(packageInfo.versionCode);
 				appVersionName = String.valueOf(packageInfo.versionName);
-=======
->>>>>>> e7643a1c... fix(app): check application package
 			} catch (Exception ex) {
 				FlyveLog.e(ex.getMessage());
 			}