# Conflicts:
#	src/main/java/com/elephant/framework/galaxy/aroad/security/config/ResourceServerConfiguration.java