# Conflicts:
#	common/pom.xml
#	common/src/main/java/com/jeesite/common/web/http/ServletUtils.java
#	common/src/main/resources/static/laydate/5.0/laydate.js
#	modules/core/pom.xml
#	modules/core/src/main/java/com/jeesite/common/shiro/filter/FormAuthenticationFilter.java
#	modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx
#	modules/core/src/main/java/com/jeesite/modules/sys/web/LoginController.java
#	modules/core/src/main/resources/config/jeesite-core.yml
#	modules/core/src/main/resources/db/upgrade/core/versions
#	modules/core/src/main/resources/templates/modules/gen/include/searchForm.html
#	modules/core/src/main/resources/views/modules/msg/msgInnerList.html
#	modules/core/src/main/resources/views/modules/sys/account/registerUser.html
#	modules/core/src/main/resources/views/modules/sys/logList.html
#	modules/template/pom.xml
#	parent/pom.xml
#	root/pom.xml
#	web/pom.xml
#	web/src/main/resources/config/application.yml
#	web/src/main/resources/views/modules/demo/demoDataGridEditGrid.html
#	web/src/main/resources/views/modules/demo/demoDataGridGroupGrid.html
#	web/src/main/resources/views/modules/test/testDataForm.html
#	web/src/main/resources/views/modules/test/testDataList.html
#	web/src/test/java/com/jeesite/test/InitData.java