net cofig

zjdx1998 · Sep 11, 2019 · e3327a7 · e3327a7
1 parent 1801110
commit e3327a7
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/SEUGrocery/android/app/src/main/res/xml/network_security_config.xml b/SEUGrocery/android/app/src/main/res/xml/network_security_config.xml
@@ -1,11 +1,4 @@
-<<<<<<< HEAD
 <?xml version = "1.0" encoding = "utf-8"?>
 <network-security-config>
     <base-config cleartextTrafficPermitted ="true"/>
 </network-security-config>
-=======
-<?xml version="1.0" encoding="utf-8" ?>
-<network-security-config>
-    <base-config cleartextTrafficPerimitted="true"/>
-</network-security-config>
->>>>>>> 8f77b77b89577d74823b8d6ef7912f0b5ca892fb