Reverting Back to Working Branch

utils/allowlist.py

@@ -27,6 +27,7 @@ import utils.colortext as ct
 
 >>>>>>> b187d8c (Added colors)
 
+
 def pullPolicyExechistories(url, choice, policiesnames, outputjson: bool): 
    
     headers = {
@@ -81,9 +82,12 @@ def listPolicies(url):
         policyids.append(list['groupid'])
     choice = input(ct.colorText("Select Policy Group: ", "white"))
     choice = int(choice) - 1
+<<<<<<< HEAD
 <<<<<<< HEAD
     return choice, policiesnames
 =======
+=======
+>>>>>>> b187d8cd79c04d364185a4e366d0432841a3372a
     checkpoint = '000000000000000000000000'
     json_output = {'error': 'Success', 'response': {'exechistories': []}}
     while True:
@@ -152,4 +156,7 @@ def checkpoint_stomper(checkpoint, url, policy, headers):
 
 
     print("Finished")
+<<<<<<< HEAD
 >>>>>>> ccbf716 (Zar-Branch (#6))
+=======
+>>>>>>> b187d8cd79c04d364185a4e366d0432841a3372a