From 2c38b2655335b70116fc5b2d7e5203c6bdede89b Mon Sep 17 00:00:00 2001
From: wlf <920607690@qq.com>
Date: Sat, 12 Jan 2019 22:52:47 +0800
Subject: [PATCH] Merge branch 'master' of
 https://bdgit.educoder.net/zhailw/gdms into wlf

# Conflicts:
#	GDMS.iml
#	src/servlet/account/login.java
---
 src/servlet/basic_settings/S_Listener.java | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/servlet/basic_settings/S_Listener.java

diff --git a/src/servlet/basic_settings/S_Listener.java b/src/servlet/basic_settings/S_Listener.java
deleted file mode 100644
index 84b0026..0000000
--- a/src/servlet/basic_settings/S_Listener.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package servlet.basic_settings;
-
-public class S_Listener {
-}