From 3b928cddcb497ebcd5854b387e515f0d2c344e09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Mon, 14 Nov 2022 21:45:22 +0100
Subject: [PATCH] FIX: merge residuals
---
unittests/test_converters.py | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/unittests/test_converters.py b/unittests/test_converters.py
index e9145b3f..38eb15fa 100644
--- a/unittests/test_converters.py
+++ b/unittests/test_converters.py
@@ -432,11 +432,7 @@ def test_converter_value_match(converter_registry):
m = dc.match(IntegerElement(name="a", value=4))
# overwrite default with match for float
-<< << << < HEAD
- dc = FloatElementConverter(
-== == == =
- dc=DictIntegerElementConverter(
->>>>>> > f-values
+ dc=IntegerElementConverter(
definition={
"match_name": "(.*)",
"match_value": "(.*)",
--
GitLab