# Conflicts:
#	application/api_broker/extend/Basic.php
#	application/app_broker/view/index/customerinfo_customer_add.html
#	application/app_broker/view/index/customerinfo_details_new.html
#	application/index/controller/Agent.php
#	application/index/controller/District.php
#	application/index/view/agent/agent.html
#	application/route.php
#	public/app/js/customerinfo_customer_add.js
#	public/app/js/customerinfo_details_new.js

# Conflicts:
#	public/app/dist/index.html
#	public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map