doh; missed a merge marker

msgpack · Aug 20, 2024 · 0dc574e · 0dc574e
1 parent eb36a12
commit 0dc574e
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/package.xml b/package.xml
@@ -224,10 +224,6 @@
  <providesextension>msgpack</providesextension>
  <extsrcrelease />
  <changelog>
-<<<<<<< HEAD
-
-=======
->>>>>>> ranvis-assoc
   <release>
    <date>2020-07-27</date>
     <version>