package wasdev.sample.servlet;

import java.io.IOException;

import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

/**
 * Servlet implementation class SimpleServlet
 */
@WebServlet("/SimpleServlet")
public class SimpleServlet extends HttpServlet {
    private static final long serialVersionUID = 1L;

    /**
     * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
     */
    @Override
    protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
        response.setContentType("text/html");
<<<<<<< Upstream, based on 96aeb5c9d82a3c4f9030f1c00b5c13524d799270
        response.getWriter().print("Hello World... Atul S!");
=======
        response.getWriter().print("Hello World... This is Atul !");
>>>>>>> 3e553a4 change
    }

}

@@ -747,146 +747,8 @@
 %22);%0A
-%3C%3C%3C%3C%3C%3C%3C Upstream, based on 96aeb5c9d82a3c4f9030f1c00b5c13524d799270%0A        response.getWriter().print(%22Hello World... Atul S!%22);%0A=======%0A
     
@@ -811,36 +811,14 @@
 tul 
+S
 !%22);%0A
-%3E%3E%3E%3E%3E%3E%3E 3e553a4 change%0A
     

Change for me