Update helpers.py

SimplySecurity · Jun 27, 2016 · f7d809f · f7d809f
1 parent 39ab80d
commit f7d809f
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/Helpers/helpers.py b/Helpers/helpers.py
@@ -5,15 +5,11 @@
 import logging
 import time
 import magic
-<<<<<<< HEAD
 import json
-=======
->>>>>>> master
 import configparser
 import collections
 from fake_useragent import UserAgent
 
-<<<<<<< HEAD
 def dictToJson(inputDict):
     """
     Takes in a list of dict items.
@@ -49,8 +45,6 @@ def JsonListToJsonObj(inputJsonList, domain):
     obj = json.dumps(dic, indent=4, sort_keys=True)
     return obj
 
-=======
->>>>>>> master
 def color(string, status=True, warning=False, bold=True, blue=False, firewall=False):
     # Change text color for the linux terminal, defaults to green.
     # Set "warning=True" for red.