# Conflicts:
#	.gitignore
#	application/api/controller/AttentionShop.php
#	application/api/controller/Member.php
#	application/api_broker/controller/FollowUp.php
#	application/api_broker/extend/Basic.php
#	application/chat/controller/AppChat.php
#	application/chat/service/ChatService.php
#	application/config.php
#	application/index/controller/Auth.php
#	application/index/controller/BusinessDistrict.php
#	application/index/controller/HouseInfo.php
#	application/index/controller/Houses.php
#	application/index/view/auth/access.html
#	application/index/view/auth/index.html
#	application/index/view/auth/role_edit.html
#	application/index/view/houses/edit.html
#	application/index/view/houses/houseList.html
#	application/index/view/member/member.html
#	application/model/AAgents.php
#	application/model/Agents.php
#	application/model/AuthGroup.php
#	application/model/AuthGroupAccess.php
#	application/model/AuthRule.php
#	application/model/BaseModel.php
#	application/model/GHouses.php
#	application/model/GHousesImgs.php
#	application/model/GHousesToAgents.php
#	application/model/JournalAccounts.php
#	application/model/Remarks.php
#	application/model/Users.php
#	application/route.php
#	build.php
#	public/resource/js/auth.js
#	public/resource/js/edit.js
#	public/resource/js/houseList.js
#	public/resource/js/role_edit.js
#	public/resource/template/auth_template_tpl.html
#	public/resource/template/house_template_tpl.html