fix conflict

2020-01-09 10:16:01 +08:00
parent 742b72d9e4
commit b93a5f2bb6
41 changed files with 262 additions and 156 deletions
--- a/modules/mogo-module-tanlu/src/main/AndroidManifest.xml
+++ b/modules/mogo-module-tanlu/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.mogo.tanlu">
+    package="com.mogo.module.tanlu">

    <application>
        <activity