Skip to content

Commit 2c22b1f

Browse files
TommyDL-InfomaniakKevinBoulongne
authored andcommitted
Fix manifest merge conflict over usesCleartextTraffic property
1 parent 7385c51 commit 2c22b1f

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

app/src/main/AndroidManifest.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
android:networkSecurityConfig="@xml/network_security_config"
5959
android:roundIcon="@mipmap/ic_launcher_round"
6060
android:theme="@style/AppTheme.Pink"
61-
android:usesCleartextTraffic="false"
61+
android:usesCleartextTraffic="true"
62+
tools:replace="android:usesCleartextTraffic"
6263
tools:targetApi="UPSIDE_DOWN_CAKE">
6364

6465
<meta-data

0 commit comments

Comments
 (0)