Fix merge

This commit is contained in:
Thomas 2020-05-04 18:37:01 +02:00
parent 3ef3996fee
commit 26aefa22cd
1 changed files with 1 additions and 1 deletions

View File

@ -16,7 +16,7 @@
android:theme="@style/AppTheme" android:theme="@style/AppTheme"
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning,UnusedAttribute" tools:ignore="GoogleAppIndexingWarning,UnusedAttribute"
tools:replace="android:label"> tools:replace="android:label,android:icon,android:roundIcon">
<activity <activity
tools:replace="android:label" tools:replace="android:label"