doh; missed a merge marker

m6w6 · m6w6 · commit 0dc574e53187 · 2024-08-20T16:44:57.000+02:00
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>
