danielthank/conflict_test — pull request #4 by danielthank (2014-11-17 15:23:49+00:00)
Title: dev2 commit1

dev2 -> dev1