图片
删除图片
Merge branch 'master' of https://github.com/yisiwei/Vaccination.git
Merge branch 'pr/4' of https://github.com/yisiwei/Vaccination.git

Conflicts:
	bin/res/crunch/drawable-hdpi/weather_content_bg.png