From b94c33b2bb4510e678a5a9794d5c4ff34f305ba3 Mon Sep 17 00:00:00 2001
From: Shubham Aggarwal <sbmaggarwal@gmail.com>
Date: Tue, 29 Nov 2016 14:33:23 +0530
Subject: [PATCH] conflicts removed

---
 javax-servlets/src/main/java/com/root/FormServlet.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/javax-servlets/src/main/java/com/root/FormServlet.java b/javax-servlets/src/main/java/com/root/FormServlet.java
index 94d0056e21..76961b7780 100644
--- a/javax-servlets/src/main/java/com/root/FormServlet.java
+++ b/javax-servlets/src/main/java/com/root/FormServlet.java
@@ -34,6 +34,13 @@ public class FormServlet extends HttpServlet {
         }
     }
 
+    @Override
+    protected void doGet(HttpServletRequest request, HttpServletResponse response)
+            throws ServletException, IOException {
+
+        // do something else here
+    }
+
     private Double calculateBMI(Double weight, Double height) {
 
         return weight / (height * height);