Merge Testing

server/src/main/java/com/example/Greeter.java

@@ -1,3 +1,4 @@
+
 package com.example;
 
 /**
@@ -12,8 +13,7 @@ public Greeter() {
 
  }
 
- //TODO: Add javadoc comment
- public String greet(String someone) {
- return String.format("Hello, %s!", someone);
+ public String greet(final String someone) {
+ return String.format("Hello Kalpesh, %s!", someone);
  }
 }

webapp/src/main/webapp/MyNewFile.jsp

@@ -0,0 +1,3 @@
+Hello how are
+you
+no typing please do something

webapp/src/main/webapp/index.jsp

@@ -1 +1 @@
-Hello, World!
+Hello, Version 1.1!!!