press Enter to finish editing
Merge branch 'master' of git@github.com:jounik/TodoMVC.git

Conflicts:
	src/org/vaadin/example/todomvc/ToDoView.java