From 6486693cd3d4692d3db2552430c126ea2a96ba7d Mon Sep 17 00:00:00 2001 From: L1ghtn1ng Date: Tue, 6 Oct 2020 16:02:16 +0100 Subject: [PATCH] Fix deps --- Pipfile | 4 ---- requirements/base.txt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/Pipfile b/Pipfile index 23e210c7..97dcabc1 100644 --- a/Pipfile +++ b/Pipfile @@ -8,12 +8,8 @@ aiodns = "==2.0.0" aiohttp = "==3.6.2" aiomultiprocess = "==0.8.0" aiosqlite = "==0.15.0" -<<<<<<< Updated upstream beautifulsoup4 = "==4.9.3" -======= -beautifulsoup4 = "==4.9.1" censys = "==1.0.0" ->>>>>>> Stashed changes dnspython = "==2.0.0" netaddr = "==0.8.0" plotly = "==4.11.0" diff --git a/requirements/base.txt b/requirements/base.txt index b4014950..3c727189 100644 --- a/requirements/base.txt +++ b/requirements/base.txt @@ -2,12 +2,8 @@ aiodns==2.0.0 aiohttp==3.6.2 aiomultiprocess==0.8.0 aiosqlite==0.15.0 -<<<<<<< Updated upstream beautifulsoup4==4.9.3 -======= -beautifulsoup4==4.9.1 censys==1.0.0 ->>>>>>> Stashed changes certifi==2020.6.20 dnspython==2.0.0 netaddr==0.8.0