a

Conflicts:
	TestProject1/src/org/talend/test/TestClass.java