Testing for Checkin
Testing for Check in and check oot
Changes by Jai
Merge branch 'TestBranch_v1.0' of https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Modify the existing file
Merge branch 'TestBranch_v1.0' of https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
testing....
testing....
Added the code for JSP
Merge branch 'TestBranch_v1.0' of https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Made changed on index.jsp to verify the conflict
Merge branch 'TestBranch_v1.0' of https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Changes for conflict
Removed the duplicate sysout
Changes after merging conflicts
conflicts merged
New JSP : Welcome.jsp
Merge branch 'TestBranch_v1.0' of https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Merge branch 'TestBranch_v1.0' of http://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0
Merge branch 'TestBranch_v1.0' of https://github.com/nilesh2013/Test_WebApp.git into TestBranch_v1.0