# Conflicts: # nladmin-system/nlsso-server/src/main/resources/config/application-dev.yml # nladmin-system/nlsso-server/src/main/resources/config/application.yml