# Conflicts:
#	src/main/webapp/modules/cont/CON_ET001/con_early_termination_et_detail.lview
#	src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview
#	src/main/webapp/modules/hls/HLS214N/hls_bp_master_req_modify.lview