Fixed merge conflicts

blindpandas · Jan 17, 2024 · e1b4f81 · e1b4f81
2 parents e4bc6eb + ae4b19f
commit e1b4f81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/requirements-app.txt b/requirements-app.txt
@@ -39,7 +39,7 @@ numpy==1.22.0
 odfpy==1.4.1
 opencv-python-headless==4.5.5.62
 peewee==3.15.4
-Pillow==9.5.0
+Pillow==10.2.0
 platform-utils==1.5.1
 pydantic==2.3.0
 pymediawiki==0.7.2

diff --git a/requirements-dev.txt b/requirements-dev.txt
@@ -4,7 +4,7 @@ black==23.9.1
 distro==1.5.0;sys_platform=="linux"
 isort==5.12.0
 invoke==2.2.0
-jinja2==3.1.2
+jinja2==3.1.3
 packaging==23.1
 pyinstaller==5.13.2
 pyinstaller-hooks-contrib==2023.8