checking conflict:09:47
Merge branch 'test-branch-new' of https://github.com/rashmik/testgit.git
into test-branch-new

Conflicts:
	test-git/src/com/test/git/java/Test.java