Fix merge conflict

This commit is contained in:
Jay Townsend 2019-08-03 14:26:18 +01:00
commit 3ff108aaa7

View file

@ -1,10 +1,9 @@
beautifulsoup4==4.8.0
censys==0.0.8
chart-studio==1.0.0
plotly==4.0.0
plotly==3.10.0
pytest==5.0.1
PyYaml==5.1.1
psycopg2-binary==2.8.3
requests==2.22.0
shodan==1.14.0
texttable==1.6.2