fix wrong pom after merge

vaimee · May 2, 2024 · 4adec9b · 4adec9b
1 parent ff79bb0
commit 4adec9b
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -39,15 +39,9 @@
 		</developer>
 	</developers>
 	<scm>
-<<<<<<< HEAD
-		<connection>scm:git:git://github.com/vaimee/SEPA.git</connection>
-		<developerConnection>scm:git:ssh://github.com/vaimee/SEPA.git</developerConnection>
-		<url>https://github.com/arces-wot/SEPA</url>
-=======
 		<connection>scm:git:git://github.com/vaimee/sepa.git</connection>
 		<developerConnection>scm:git:ssh://github.com/vaimee/sepa.git</developerConnection>
 		<url>https://github.com/vaimee/SEPA</url>
->>>>>>> branch 'master' of https://github.com/arces-wot/sepa.git
 	</scm>
 	<properties>
 		<maven.compiler.source>13</maven.compiler.source>