resolve conflicts

amidaware · Jan 7, 2022 · 21308fb · 21308fb
1 parent a14230a
commit 21308fb
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/web/src/components/agents/AgentActionMenu.vue b/web/src/components/agents/AgentActionMenu.vue
@@ -61,10 +61,6 @@
       </q-item-section>
       <q-item-section>Send Command</q-item-section>
     </q-item>
-<<<<<<< HEAD
-=======
-
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
     <q-item clickable v-ripple v-close-popup @click="showRunScript(agent)">
       <q-item-section side>
         <q-icon size="xs" name="fas fa-terminal" />
@@ -194,10 +190,7 @@
 </template>
 
 <script>
-<<<<<<< HEAD
 import axios from "axios";
-=======
->>>>>>> 2c9d413a1a0d4d3715ac77ea408c94d156899e83
 // composition imports
 import { ref, inject } from "vue";
 import { useStore } from "vuex";