MISP
/
misp-modules
mirror of https://github.com/MISP/misp-modules
2
0
Fork 0
Code Issues Releases Wiki Activity

resolve merge conflict

pull/452/head
Jens Thom 2020-11-30 12:24:35 +01:00
parent a404202d1d
commit 9dd120b0cf
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
REQUIREMENTS
View File

@ -58,16 +58,10 @@ jsonschema==3.2.0
lief==0.10.1
lxml==4.6.2
maclookup==1.0.3
<<<<<<< HEAD
markdownify==0.5.3
maxminddb==2.0.2; python_version >= '3.6'
multidict==4.7.6; python_version >= '3.5'
=======
mail-parser==3.14.0
markdownify==0.5.3
maxminddb==2.0.3; python_version >= '3.6'
multidict==5.0.2; python_version >= '3.5'
>>>>>>> upstream/main
np==1.0.2
numpy==1.19.4; python_version >= '3.6'
oauth2==1.9.0.post1