summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLAPTOP-CUUVN8AS\wk <[email protected]>2022-07-26 14:08:33 +0800
committerLAPTOP-CUUVN8AS\wk <[email protected]>2022-07-26 14:08:33 +0800
commit2ecce645a8d1b73a4f812bc01064f65594216745 (patch)
tree25136e98f9a5dae826599cf2808361b51fe4f48f
parent0acc85e67b3a21c73aa760f3690de28945ea4c8b (diff)
pom乱码
-rw-r--r--pom.xml4
1 files changed, 0 insertions, 4 deletions
diff --git a/pom.xml b/pom.xml
index 9c4b862..f790062 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,11 +6,7 @@
<groupId>com.zdjizhi</groupId>
<artifactId>radius-relation</artifactId>
-<<<<<<< HEAD
<version>22-04-01</version>
-=======
- <version>22-03-09</version>
->>>>>>> c8041564036f715f1a9eacc8bf6deb513542b2c6
<name>radius-relation</name>
<url>http://www.example.com</url>