fix merge

ecmwf · Mar 22, 2024 · ed0a974 · ed0a974
1 parent 781e9e0
commit ed0a974
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/fdb5/api/helpers/ListIterator.cc b/src/fdb5/api/helpers/ListIterator.cc
@@ -38,11 +38,6 @@ Key ListElement::combinedKey() const {
             combined.set(kv.first, kv.second);
         }
     }
-<<<<<<< HEAD
-=======
-    combined.registry(keyParts_[2].registry());
-
->>>>>>> 8a0c3a00 (FDB-303: Remove Rule from the Key, and replace with TypesRegistry information)
     return combined;
 }