From bad8d744a2a9a4eecc3285d0a512e7b5edae6f46 Mon Sep 17 00:00:00 2001
From: Arthur Osipyan <33210928+arthurosipyan@users.noreply.github.com>
Date: Tue, 6 Nov 2018 16:29:54 -0500
Subject: [PATCH] Update requirements.txt

---
 requirements.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4a5c7e3..d38988a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,10 +20,5 @@ request==1.0.2
 requests==2.20.0
 setuptools==40.5.0
 six==1.11.0
-<<<<<<< HEAD
 urllib3==1.24.1
-xlrd==1.1.0
-=======
-urllib3==1.24
-xlrd==1.1.0
->>>>>>> 2fa610c784e2d824d53a766a86d45c52886bf961
+xlrd==1.1.0
\ No newline at end of file