NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 01:41:22 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Corrected merge conflict

Browse Source
This commit is contained in:
Jeremy Stretch 2017-03-07 16:55:49 -05:00
parent 02e89d77bb
commit be0a3fb1f2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requirements.txt
View File

@ -2,11 +2,7 @@ cffi>=1.8
cryptography>=1.4 cryptography>=1.4
Django>=1.10 Django>=1.10
django-debug-toolbar>=1.6 django-debug-toolbar>=1.6
<<<<<<< HEAD
django-filter==0.15.3
=======
django-filter>=1.0.1 django-filter>=1.0.1
>>>>>>> develop
django-mptt==0.8.7 django-mptt==0.8.7
django-rest-swagger==0.3.10 django-rest-swagger==0.3.10
django-tables2>=1.2.5 django-tables2>=1.2.5