From cebf16350e611819f211fff438b3da07ea207859 Mon Sep 17 00:00:00 2001
From: wan <2499498893@qq.com>
Date: Sat, 12 Jan 2019 22:53:10 +0800
Subject: [PATCH] Merge remote-tracking branches 'remotes/origin/master' and
 'remotes/origin/wlf' into wmj

# Conflicts:
#	GDMS.iml
#	src/servlet/account/login.java
---
 src/servlet/account/login.java | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/servlet/account/login.java b/src/servlet/account/login.java
index 25b1c11..12a8cd0 100644
--- a/src/servlet/account/login.java
+++ b/src/servlet/account/login.java
@@ -31,13 +31,10 @@ public class login extends HttpServlet {
       } catch (Exception e) {
         e.printStackTrace();
       }
-<<<<<<< .merge_file_a01548
     request.getSession().setAttribute("User",user);
       request.getRequestDispatcher("/home.jsp").forward(request,response);
-=======
       request.getSession().setAttribute("User",user);
     request.getRequestDispatcher("/home.jsp").forward(request,response);
->>>>>>> .merge_file_a15580
   }
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response)