# Conflicts: # modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java # modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java
# Conflicts: # modules/mogo-module-common/src/main/java/com/mogo/module/common/datacenter/SnapshotLocationDataCenter.java # modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java