# Conflicts:
#	application/api_broker/controller/Broker.php
#	application/api_broker/controller/User.php
#	application/app_broker/view/index/customerinfo_details_new.html
#	application/index/view/cell_phone/index.html
#	application/index/view/member/users_list.html
#	application/model/UPhoneFollowPp.php
#	application/route.php
#	public/app/dist/index.html
#	public/app/dist/static/css/app.255c54a886ff5092e74bb857c3d5fcc5.css
#	public/app/dist/static/css/app.d71c440380385dc9451393bdcab7acfb.css
#	public/app/dist/static/css/app.d71c440380385dc9451393bdcab7acfb.css.map
#	public/app/dist/static/css/app.da05cd787f6852fe2b2d15ad25fdd72c.css
#	public/app/dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
#	public/app/js/customerinfo_details_new.js
#	public/resource/js/user.js