fix conflicts after rebase

betagouv · Feb 17, 2025 · 02bdb48 · 02bdb48
1 parent a1dd8e9
commit 02bdb48
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/pyproject.toml b/pyproject.toml
@@ -29,6 +29,7 @@ dependencies = [
     "django-gravatar2>=1.4.5",
     "django-guardian==2.4.0",
     "django-hijack==3.4.5",
+    "django-htmx>=1.22.0",
     "django-json-widget==2.0.1",
     "django-leaflet>=0.31.0",
     "django-magicauth",

diff --git a/requirements.txt b/requirements.txt
@@ -368,6 +368,9 @@ django-guardian==2.4.0 \
 django-hijack==3.4.5 \
     --hash=sha256:129cbe75444b163135871a947d38ffb72181f4f2583544703fc9efe083c9ddad \
     --hash=sha256:7e45b1de786bdc130628e4230b359dde6d8744ecd3bcd668d2b27c5d614a071c
+django-htmx==1.22.0 \
+    --hash=sha256:7306e1aba4e407496f30a57ec2e0b2974a9b96c8c6036f7ec6a8b5753ea0abdd \
+    --hash=sha256:9f1fcf239125a42d6dadc814b3796b8d6faad8ded444a14ae021d0241fa9a40f
 django-json-widget==2.0.1 \
     --hash=sha256:adb4cab17fe5a04139037d7d84725369530ef35b912c3790d3a7b13f99351358
 django-leaflet==0.31.0 \

diff --git a/uv.lock b/uv.lock