From 1ebe7a0d25dc9885acde01a626b8ee232497f3d1 Mon Sep 17 00:00:00 2001
From: Andrew Azores <aazores@redhat.com>
Date: Wed, 11 Sep 2024 16:13:05 -0400
Subject: [PATCH] fixup! ci(snapshots): remove trailing slash (#461)

---
 pom.xml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9c7a2d7f..8b5fa6a0 100644
--- 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>