From 0e3f6495cf1d090ed295d3e71a77d34e5f7e5aa5 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Mon, 22 Oct 2018 12:12:57 +0200
Subject: [PATCH] Fix a manifest merger issue

---
 app/src/gplay/AndroidManifest.xml | 2 +-
 app/src/main/AndroidManifest.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/gplay/AndroidManifest.xml b/app/src/gplay/AndroidManifest.xml
index 3b0f7111f..1474521d4 100644
--- a/app/src/gplay/AndroidManifest.xml
+++ b/app/src/gplay/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="label, icon, roundIcon, theme, name, allowBackup">
+        tools:replace="label, icon, theme, name, allowBackup">
 
         <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
         <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a2b7002a0..06906a3c3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="label, icon, roundIcon, theme, name, allowBackup">
+        tools:replace="label, icon, theme, name, allowBackup">
 
 
         <meta-data