From 64b432916af9c9218ab3f3eca614e26c542142ae Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 十一月 2023 15:47:13 +0800
Subject: [PATCH] bug

---
 server/src/main/java/doumeemes/config/shiro/ShiroToken.java |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
index 558ab19..14b3889 100644
--- a/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
+++ b/server/src/main/java/doumeemes/config/shiro/ShiroToken.java
@@ -1,13 +1,6 @@
 package doumeemes.config.shiro;
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 import doumeemes.core.model.LoginUserInfo;
-=======
->>>>>>> 1.0.3
-=======
-import doumeemes.core.model.LoginUserInfo;
->>>>>>> dev
 import org.apache.shiro.authc.UsernamePasswordToken;
 import org.springframework.stereotype.Component;
 

--
Gitblit v1.9.3