From 9ca3386ff39dc990cea83cd166221455307fcd7d Mon Sep 17 00:00:00 2001
From: Piero Toffanin <pt@masseranolabs.com>
Date: Wed, 14 Apr 2021 12:01:18 -0400
Subject: [PATCH] Fix requirements.txt

---
 requirements.txt | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 05ba828e..950c8b7b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,13 +13,8 @@ matplotlib==3.3.3
 networkx==2.5
 numpy==1.19.4
 Pillow==8.0.1
-<<<<<<< HEAD
 vmem==1.0.0
-pyodm==1.5.4
-=======
-psutil==5.7.3
 pyodm==1.5.5
->>>>>>> 1b0f17042e5b0ccf4026f950939e5a2c0b29642a
 pyOpenSSL==19.1.0
 pyproj==3.0.0.post1
 Pysolar==0.9