Robotail/Corp
Robotail/Corp
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: удалены маркеры конфликта из requirements.txt

Browse Source
This commit is contained in:
lizerk 2026-03-06 19:01:27 +03:00
parent d1ea2d8c6e
commit e3ba94eb43
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/requirements.txt
View File

@ -131,8 +131,6 @@ flower>=2.0.1
# Push Notifications
django-push-notifications==3.1.0
<<<<<<< HEAD
=======
# File Management with django-filer
django-filer==3.4.4
@ -144,4 +142,3 @@ django-reversion==6.1.0
# Workflow State Machine
django-fsm==3.0.1
>>>>>>> feature/django-filer-documents