# Conflicts:
#	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_current_query.lwm
#	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_query.lwm
#	src/main/webapp/WEB-INF/classes/rpt/RPT555/con_je_vat_total_query.lwm
#	src/main/webapp/WEB-INF/server-script/layoutconfig/con_tenant_change_modify_t_history_ingo_queryfields.js
#	src/main/webapp/leafresource/leaf.ui.std/hap/base/Leaf-all-min.css
#	src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview
#	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create_entrance.lview
#	src/main/webapp/modules/hls/HLS530/manual_journal_create.lview
#	src/main/webapp/modules/rpt/RPT555/con_je_vat_query.lview