moumoua N1
asdfdf
moumoua n1
fda
moumou n2
Merge branch 'moumoua_b2'
Merge branch 'master' of
https://github.com/zhangbiao7526/togoandroidDemo.git

Conflicts:
	togoandroidDemo/bin/R.txt
	togoandroidDemo/bin/classes/com/example/togodemo/HomeFragment.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$id.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$integer.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$layout.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$menu.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$string.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$style.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$styleable.class
	togoandroidDemo/bin/classes/com/example/togodemo/ShopcarFragment$NewAdapter.class
	togoandroidDemo/bin/classes/com/example/togodemo/ShopcarFragment.class
	togoandroidDemo/bin/classes/com/example/togodemo/home/OneSop_click.class
	togoandroidDemo/bin/classes/com/example/togodemo/user/UserRegister$2.class
	togoandroidDemo/bin/classes/com/example/togodemo/user/UserRegister.class
	togoandroidDemo/gen/com/example/togodemo/R.java
国色
fas
Merge branch 'master' of
https://github.com/zhangbiao7526/togoandroidDemo.git

Conflicts:
	togoandroidDemo/bin/R.txt
	togoandroidDemo/bin/classes/com/example/togodemo/HomeFragment.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$id.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$integer.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$layout.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$menu.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$string.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$style.class
	togoandroidDemo/bin/classes/com/example/togodemo/R$styleable.class
	togoandroidDemo/bin/classes/com/example/togodemo/ShopcarFragment$NewAdapter.class
	togoandroidDemo/bin/classes/com/example/togodemo/ShopcarFragment.class
	togoandroidDemo/bin/classes/com/example/togodemo/home/OneSop_click.class
	togoandroidDemo/bin/classes/com/example/togodemo/user/UserRegister$2.class
	togoandroidDemo/bin/classes/com/example/togodemo/user/UserRegister.class
	togoandroidDemo/gen/com/example/togodemo/R.java
阿发
wang
wang
tiaozhuan
tiaozhuan