AndroidManifest.xml
1.17 KB
-
Merge remote-tracking branch 'origin/master' · b9c5dcf3# Conflicts: # login-module/src/main/AndroidManifest.xml # main-module/src/main/AndroidManifest.xml # main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
宁斌 committed