From 8a17311c9516e63aeb31111647fdf21083bcf928 Mon Sep 17 00:00:00 2001
From: Martin Czygan <martin.czygan@gmail.com>
Date: Thu, 15 Apr 2021 16:07:52 +0200
Subject: cleanup merge artifact

---
 tests/test_matching.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'tests')

diff --git a/tests/test_matching.py b/tests/test_matching.py
index 997a9e6..438a191 100644
--- a/tests/test_matching.py
+++ b/tests/test_matching.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import logging
 import warnings
 
-- 
cgit v1.2.3