map created
gitignore
delete gen bin
try push continue
update .gitignore
another try
init timesline
remove gen/ directory
Merge branch 'develop' of github.com:iceleaf916/TravelTimes
show ok
Merge branch 'timesline' of github.com:iceleaf916/TravelTimes

Conflicts:
	AndroidManifest.xml
	gen/com/deepin/traveltimes/R.java
update