Reverting Back to Working Branch
This commit is contained in:
@@ -18,9 +18,14 @@ import json
|
|||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
|
<<<<<<< HEAD
|
||||||
import utils.colortext as ct
|
import utils.colortext as ct
|
||||||
=======
|
=======
|
||||||
>>>>>>> ccbf716 (Zar-Branch (#6))
|
>>>>>>> ccbf716 (Zar-Branch (#6))
|
||||||
|
=======
|
||||||
|
import utils.colortext as ct
|
||||||
|
|
||||||
|
>>>>>>> b187d8c (Added colors)
|
||||||
|
|
||||||
def pullPolicyExechistories(url, choice, policiesnames, outputjson: bool):
|
def pullPolicyExechistories(url, choice, policiesnames, outputjson: bool):
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user