From 26aefa22cd9cf9d8d4c01109ccaa74b7de661dad Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Mon, 4 May 2020 18:37:01 +0200
Subject: [PATCH] Fix merge

---
 app/src/fullLinks/AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/fullLinks/AndroidManifest.xml b/app/src/fullLinks/AndroidManifest.xml
index 5f09766..81b7062 100644
--- a/app/src/fullLinks/AndroidManifest.xml
+++ b/app/src/fullLinks/AndroidManifest.xml
@@ -16,7 +16,7 @@
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
         tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
-        tools:replace="android:label">
+        tools:replace="android:label,android:icon,android:roundIcon">
 
         <activity
             tools:replace="android:label"