passengers
sync
merge
应该同步成功了
Merge remote-tracking branch 'origin/master'

Conflicts:
	project.properties
	src/com/example/zero1/TicketClient.java
	src/com/example/zero1/TrainsInfoActivity.java