# Conflicts: # src/main/java/com/boot/security/server/config/DruidConfig.java # src/main/resources/static/index.html # src/main/resources/static/login.html # src/main/resources/static/pages/dashboard.html