Fix merge
This commit is contained in:
parent
3ef3996fee
commit
26aefa22cd
|
@ -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"
|
||||||
|
|
Loading…
Reference in New Issue