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

Fixed merge conflict in requirements.txt

Browse Source
This commit is contained in:
Jeremy Stretch 2019-06-05 14:47:20 -04:00
parent 3bb3b85fa2
commit 50cbfb9360
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
requirements.txt
View File

@ -10,13 +10,8 @@ django-tables2==2.0.6
django-taggit==1.1.0
django-taggit-serializer==0.1.7
django-timezone-field==3.0
<<<<<<< HEAD
djangorestframework==3.9.2
drf-yasg[validation]==1.15.0
=======
djangorestframework==3.9.1
drf-yasg[validation]==1.14.0
>>>>>>> develop
graphviz==0.10.1
Jinja2==2.10.1
Markdown==2.6.11