new file:   test.txt
yuhui
	modified:   Pigeon/obj/Debug/App.g.i.cs
	modified:   Pigeon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	modified:   Pigeon/obj/Debug/Login.g.i.cs
	modified:   Pigeon/obj/Debug/MainPage.g.i.cs
	new file:   Pigeon.v11.suo
Merge branch 'developer' into yuhui
modify
dfjofdj
dfjodf
remove obj
modify
modify
	deleted:    test.txt
Merge branch 'developer' of https://github.com/liuxiaohao/Pigeon into developer

Conflicts:
	Pigeon/obj/Debug/App.g.i.cs
	Pigeon/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Pigeon/obj/Debug/Login.g.i.cs
	Pigeon/obj/Debug/Main.g.i.cs
	Pigeon/obj/Debug/MainPage.g.i.cs
	Pigeon/obj/Debug/Navigation.g.i.cs