commm
Merge branch 'branch1'

Conflicts:
	Testing1/target/m2e-wtp/web-resources/META-INF/maven/com.srinergi/Testing1/pom.properties
:)
commit 2:05
Merge branch 'master' into branch1

Conflicts:
	Testing1/target/m2e-wtp/web-resources/META-INF/maven/com.srinergi/Testing1/pom.properties
add (:
------
Merge branch 'master' into branch1

Conflicts:
	Testing1/target/m2e-wtp/web-resources/META-INF/maven/com.srinergi/Testing1/pom.properties
888888888
Merge branch 'branch1'

Conflicts:
	Testing1/target/m2e-wtp/web-resources/META-INF/maven/com.srinergi/Testing1/pom.properties
add hello
commit