Resolve conflict

.circleci/test.py

@@ -0,0 +1,17 @@
+#!/usr/bin/python
+
+import requests, sys, os, json
+
+
+baseurl = "http://localhost:1337"
+endpoint = "/api/admin/login"
+headers = {"Content-Type":"application/json"}
+
+
+# Authentication Test
+
+data = {"username":"empireadmin", "password":"Password123!"} 
+
+jdata = json.dumps(data)
+
+resp = requests.get(baseurl+endpoint, data=jdata)

empire

@@ -884,12 +884,6 @@ def start_restful_api(empireMenu, suppress=False, username=None, password=None,
 
                     agentTaskResults.append({"AgentName": agentSessionID, "AgentResults": results})
 
-<<<<<<< HEAD
-=======
-            if agentResults and agentResults[0] and agentResults[0] != '':
-                agentTaskResults.append({"AgentName":agentSessionID, "AgentResults":agentResults[0]})
-
->>>>>>> dev
         return jsonify({'results': agentTaskResults})