# Conflicts:
#	application/api_broker/controller/Broker.php
#	application/api_broker/controller/Client.php
#	application/api_broker/controller/OrderLog.php
#	application/api_broker/extend/Basic.php
#	application/api_broker/service/ReportService.php
#	application/index/controller/CellPhone.php
#	application/index/controller/Member.php
#	application/index/extend/Basic.php
#	application/index/view/global/navigation.html
#	application/index/view/member/users_list.html
#	application/index/view/remark/remark_follow_index.html
#	application/model/OrderModel.php
#	application/model/SecretReport.php
#	application/model/Users.php
#	application/route.php
#	public/resource/js/RemarkFollowIndex.js
#	public/resource/js/user.js
#	public/resource/template/user_template_tpl.html

# Conflicts:
#	application/index/view/global/navigation.html

# Conflicts:
#	application/index/view/remark/remark_follow_index.html