fixup! ci(snapshots): remove trailing slash (#461)

cryostatio · Sep 11, 2024 · 1ebe7a0 · 1ebe7a0
1 parent 99b90f2
commit 1ebe7a0
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -374,12 +374,8 @@
                     <maven-central>
                       <active>ALWAYS</active>
                       <url>https://s01.oss.sonatype.org/service/local</url>
-<<<<<<< HEAD
-                      <snapshotUrl>https://s01.oss.sonatype.org/content/repositories/snapshots/</snapshotUrl>
-                      <verifyPom>false</verifyPom><!-- FIXME remove this once the Adoptium JMC repository is removed -->
-=======
                       <snapshotUrl>https://s01.oss.sonatype.org/content/repositories/snapshots</snapshotUrl>
->>>>>>> b521ed6 (ci(snapshots): remove trailing slash (#461))
+                      <verifyPom>false</verifyPom><!-- FIXME remove this once the Adoptium JMC repository is removed -->
                       <closeRepository>true</closeRepository>
                       <releaseRepository>true</releaseRepository>
                       <stagingRepositories>target/staging-deploy</stagingRepositories>