resolve conflicts

amidaware · Jan 7, 2022 · a14230a · a14230a
1 parent 2743383
commit a14230a
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/web/src/components/agents/AgentActionMenu.vue b/web/src/components/agents/AgentActionMenu.vue
@@ -456,7 +456,6 @@ export default {
         }
       });
     }
-<<<<<<< HEAD
     function getAgentIntegrations(agent) {
       axios
           .get("agents/" + props.agent.agent_id + "/")
@@ -491,28 +490,19 @@ export default {
               console.log(e)
           });
     }
-=======
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
 
     return {
       // reactive data
       urlActions,
       favoriteScripts,
-<<<<<<< HEAD
-=======
-
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
       // methods
       showEditAgent,
       showPendingActionsModal,
       runTakeControl,
       runRemoteBackground,
       getURLActions,
       runURLAction,
-<<<<<<< HEAD
       getAgentIntegrations,
-=======
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
       showSendCommand,
       showRunScript,
       getFavoriteScripts,