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;