# Conflicts:
#	atms-api/etc/generator/generatorConfig.xml
#	atms-api/src/main/java/pwc/taxtech/atms/controller/ServiceTypeController.java
#	atms-web/src/main/webapp/app/adminApp.js
#	atms-web/src/main/webapp/app/adminModule.js
#	atms-web/src/main/webapp/bundles/adminApp.js
#	atms-web/src/main/webapp/bundles/systemConfiguration.js
#	atms-web/src/main/webapp/bundles/systemConfiguration.less