From 2b1ce6c8681cdcd26c1aefbac372ebb43b08883c Mon Sep 17 00:00:00 2001
From: L1ghtn1ng <townsend891@hotmail.com>
Date: Sat, 11 Jan 2020 20:09:18 +0000
Subject: [PATCH] Fix merge conflict in otx hopefully take2

---
 theHarvester/discovery/otxsearch.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/theHarvester/discovery/otxsearch.py b/theHarvester/discovery/otxsearch.py
index c9e00fbb..e9c9df65 100644
--- a/theHarvester/discovery/otxsearch.py
+++ b/theHarvester/discovery/otxsearch.py
@@ -1,6 +1,6 @@
 from theHarvester.lib.core import *
-# import json
-# import grequests
+import json
+import grequests
 import re