harmonize conflict in ParserServlet (again)

[sbp.git] / src / edu / berkeley / sbp / misc / ParserServlet.java

diff --git a/src/edu/berkeley/sbp/misc/ParserServlet.java b/src/edu/berkeley/sbp/misc/ParserServlet.java
index 44b3f84..9eeb7b8 100644 (file)
--- a/src/edu/berkeley/sbp/misc/ParserServlet.java
+++ b/src/edu/berkeley/sbp/misc/ParserServlet.java
@@ -8,18 +8,15 @@ import java.util.*;
 import java.io.*;
 //import javax.servlet.*;
 //import javax.servlet.http.*;
-import java.io.*;
 import java.net.*;
 import java.util.*;
 
 public class ParserServlet /*extends HttpServlet*/ {
-  /*
+    /*
     public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
         doPost(req, resp);
     }
     public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException {
-  */
-        /*
         try {
         try {
             System.out.println("a");
@@ -73,7 +70,7 @@ public class ParserServlet /*extends HttpServlet*/ {
         } catch (Exception e) {
             throw new ServletException(e);
         }
-        */
-  //}
-
+       
+  }
+    */
 }