-
# Conflicts: # src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java
-
# Conflicts: # src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java # src/main/java/com/bsth/data/gpsdata/GpsRealData.java # src/main/resources/application-dev.properties
-
# Conflicts: # src/main/java/com/bsth/data/arrival/ArrivalData_GPS.java # src/main/java/com/bsth/data/gpsdata/GpsRealData.java
-
into qingpu # Conflicts: # src/main/java/com/bsth/data/gpsdata/GpsRealData.java # src/main/resources/application-prod.properties # src/main/resources/ms-jdbc.properties
