Решены конфликты при слиянии main

2025-01-12 07:17:22 +03:00 · 2025-01-12 07:17:22 +03:00 · 2c2e2a2f5b
commit 2c2e2a2f5b
parent 5cadda8396 9cc0929a09
7 changed files with 76 additions and 1 deletions
--- a/requirements.txt
+++ b/requirements.txt
@ -1,4 +1,8 @@
 aiosqlite~=0.20.0
 Hypercorn~=0.17.3
 Quart~=0.19.6
+<<<<<<< HEAD
 babel~=2.16.0
+=======
+babel~=2.16.0
+>>>>>>> 9cc0929a09596abeb93ee7f2711527fb5da25f7a