Changes in index.jsp
new change to index.jsp
updating...
Made Changes on index.jsp to test conflict
testing updation
Merge branch 'TestBranch_v1.0' of https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
conflicts...
Merging web.xml
Merge branch 'TestBranch_v1.0' of
https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
commited local changes
Merge branch 'TestBranch_v1.0' of
http://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0

Conflicts:
	Test_WebApp/WebContent/welcome.jsp
	Test_WebApp/build/classes/Temp.class
	Test_WebApp/build/classes/index.jsp
	Test_WebApp/build/classes/myjsp.jsp
	Test_WebApp/build/classes/welcome.jsp
Removed unwanted changes from welcome.jsp
Merge branch 'TestBranch_v1.0' of
http://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0

Conflicts:
	Test_WebApp/build/classes/index.jsp
	Test_WebApp/build/classes/myjsp.jsp
	Test_WebApp/build/classes/welcome.jsp