-
# Conflicts: # src/main/resources/application.properties
-
# Conflicts: # src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java
# Conflicts: # src/main/resources/application.properties
# Conflicts: # src/main/java/com/bsth/repository/schedule/CarConfigInfoRepository.java