|
|
@@ -1,7 +1,8 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
- <component name="Encoding" native2AsciiForPropertiesFiles="true" defaultCharsetForPropertiesFiles="UTF-8">
|
|
|
+ <component name="Encoding">
|
|
|
<file url="file://$PROJECT_DIR$" charset="UTF-8" />
|
|
|
+<<<<<<< HEAD
|
|
|
<file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/HttpsClient.java" charset="UTF-8" />
|
|
|
<file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/MyX509TrustManager.java" charset="UTF-8" />
|
|
|
<file url="file://$PROJECT_DIR$/src/main/java/com/repair/common/utils/SHA1.java" charset="UTF-8" />
|
|
|
@@ -11,5 +12,7 @@
|
|
|
<file url="file://$PROJECT_DIR$/src/main/java/com/repair/model/request/AlterPriceRequest.java" charset="UTF-8" />
|
|
|
<file url="file://$PROJECT_DIR$/src/main/java/com/repair/model/result/Wx_user.java" charset="UTF-8" />
|
|
|
<file url="PROJECT" charset="UTF-8" />
|
|
|
+=======
|
|
|
+>>>>>>> 1e8a464588113a3afc236ee3f004f164bb7128ff
|
|
|
</component>
|
|
|
</project>
|