t
ear
clear
	modified:   cities.html
t
quit
Merge branch 'master' of github.com:tmcgoo/git-mania

Conflicts:
	cities.html