chore: resolve conflicts

Signed-off-by: Akhil Narang <me@akhilnarang.dev>
2026-05-24 15:39:20 +00:00 · 2024-10-01 17:29:39 +05:30
parent 7ff97794f4
commit 13f5634570
3 changed files with 2 additions and 42 deletions
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,12 +12,8 @@ dependencies = [
    "pycountry~=20.7.3",
    "python-stdnum~=1.16",
    "Unidecode~=1.2.0",
-<<<<<<< HEAD
-    "redisearch~=2.1.0",
    "rapidfuzz~=2.15.0",
    "holidays~=0.28",
-=======
->>>>>>> 4a38ce659d (refactor!: drop redisearch)

    # integration dependencies
    "gocardless-pro~=1.22.0",