# Conflicts: # app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt # app/src/main/java/com/navinfo/omqs/util/NaviEngine.kt # collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java
# Conflicts: # app/src/main/java/com/navinfo/omqs/ui/activity/login/LoginViewModel.kt # app/src/main/java/com/navinfo/omqs/util/NaviEngine.kt # collect-library/src/main/java/com/navinfo/collect/library/map/source/OMDBTileDataSource.java