# Conflicts:
#	backend/inz.basis/src/main/resources/META-INF/spring.factories

# Conflicts:
#	backend/xyst.dinas.biz/src/main/java/com/xyst/dinas/biz/config/StationConfiguration.java

For idea

See merge request kunlun/xyst_dinas/xyst_dinas_backend!1

# Conflicts:
#   backend/.gitignore
#   backend/common.gradle