diff options
| -rw-r--r-- | tests/test_matching.py | 1 |
1 files changed, 0 insertions, 1 deletions
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 |