Removing a line
Merge branch 'master' of github.com:slam02/ubuntu-vim-nodejs

Conflicts:
	temp.txt
resolving conflict
creating conflict from root
creating conflict...2