Update pom.xml

YYHYlh · May 31, 2023 · 5bce331 · 5bce331
1 parent 26d70b2
commit 5bce331
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,13 +9,8 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-<<<<<<< HEAD
-        <maven.compiler.source>8</maven.compiler.source>
-        <maven.compiler.target>8</maven.compiler.target>
-=======
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
->>>>>>> 52c739e... 1. 修复linux上无法RCE的bug
         <dubbo.version>3.1.5</dubbo.version>
     </properties>
     <dependencies>
@@ -25,8 +20,6 @@
             <version>${dubbo.version}</version>
         </dependency>
     </dependencies>
-<<<<<<< HEAD
-=======
     <build>
         <plugins>
             <plugin>
@@ -45,6 +38,5 @@
             </plugin>
         </plugins>
     </build>
->>>>>>> 52c739e... 1. 修复linux上无法RCE的bug
 
-</project>
+</project>