# Conflicts:
#	android/settings.gradle
#	component/Map/index.js
#	index.js
#	ios/Podfile
#	package-lock.json
#	package.json
#	utils/http.js
#	yarn.lock

# Conflicts:
#	android/app/src/main/java/com/fzustudyroom/MainApplication.java
#	android/settings.gradle
#	component/Mine/index.js
#	component/Navigation/index.js
#	ios/FZUStudyRoom.xcodeproj/project.pbxproj
#	ios/Podfile
#	package-lock.json
#	package.json
#	page/App.js
#	page/Home/index.js
#	page/Login/index.js
#	utils/http.js
#	yarn.lock

# Conflicts:
#	component/Map/SchoolMap/SchoolMapHome.js

# Conflicts:
#	component/Map/index.js
#	component/Mine/index.js
#	component/Study/index.js
#	page/App.js
#	page/Home/index.js