From ce1aa6137be3513352bef34bc23a598d52810dd5 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 09 十一月 2020 10:02:49 +0800
Subject: [PATCH] 增加Subject头
---
pom.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f6e9c9..b5e44c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,6 +163,7 @@
<build>
<plugins>
+
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -176,7 +177,7 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
-<<<<<<< HEAD
+ <!--
<webResources>
<resource>
<directory>${project.basedir}/libs</directory>
@@ -187,8 +188,7 @@
</includes>
</resource>
</webResources>
-=======
->>>>>>> upstream/master
+ -->
</configuration>
</plugin>
@@ -196,6 +196,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
+
</plugins>
</build>
</project>
--
Gitblit v1.8.0