diff options
author | Martin Czygan <martin.czygan@gmail.com> | 2021-04-15 16:07:52 +0200 |
---|---|---|
committer | Martin Czygan <martin.czygan@gmail.com> | 2021-04-15 16:07:52 +0200 |
commit | 8a17311c9516e63aeb31111647fdf21083bcf928 (patch) | |
tree | 8e1fd69cbedd6eb4f69fda2103061e4903467624 | |
parent | 1edd47ee8f43e8a8b84f0ce9ea2c92d998ae3efb (diff) | |
download | fuzzycat-8a17311c9516e63aeb31111647fdf21083bcf928.tar.gz fuzzycat-8a17311c9516e63aeb31111647fdf21083bcf928.zip |
cleanup merge artifact
-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 |