Merge branch 'master' of https://gitlab.navinfo.com/qiji4215/OneMapQS
Conflicts: app/build.gradle app/src/main/java/com/navinfo/omqs/OMQSApplication.kt app/src/main/java/com/navinfo/omqs/ui/MainActivity.kt app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt app/src/main/res/layout/fragment_offline_map_state_list.xml app/src/main/res/layout/map_view.xml collect-library/build.gradle
This commit is contained in:
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user