# Conflicts:
#	src/main/resources/js/admin/admin.min.js
#	src/main/resources/skins/Bubble/js/common.min.js
#	src/main/resources/skins/Casper/js/common.min.js
#	src/main/resources/skins/Finding/js/common.min.js
#	src/main/resources/skins/Jane/js/common.min.js
#	src/main/resources/skins/Medium/js/common.min.js
#	src/main/resources/skins/NeoEase/js/common.min.js
#	src/main/resources/skins/Pinghsu/js/common.min.js
#	src/main/resources/skins/metro-hot/js/common.min.js
#	src/main/resources/skins/next/js/common.min.js
#	src/main/resources/skins/nijigen/js/common.min.js