From 68e4831ea5c0770b35dbb1539ba2434ad7abc2a5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 1 Aug 2024 09:56:54 +0200
Subject: [PATCH] refs #7355 fix conflicts

---
 src/pages/Account/Card/AccountDescriptorMenu.vue | 4 ++--
 src/pages/Account/Role/Card/RoleDescriptor.vue   | 6 +-----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 4b30de127..05576b145 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -130,10 +130,10 @@ const removeAccount = async () => {
     </QItem>
 
     <QSeparator />
-    <QItem @click="removeAccount(id)" v-ripple clickable>
+    <!-- <QItem @click="removeAccount(id)" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>
         <QItemSection>{{ t('account.card.actions.delete.name') }}</QItemSection>
-    </QItem>
+    </QItem> -->
 </template>
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index a8d29cf66..e4af3ed13 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -1,11 +1,10 @@
 <script setup>
 import { ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
-import { useQuasar } from 'quasar';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 const $props = defineProps({
@@ -22,9 +21,6 @@ const $props = defineProps({
 
 const route = useRoute();
 
-const quasar = useQuasar();
-const router = useRouter();
-
 const { notify } = useNotify();
 const { t } = useI18n();
 const entityId = computed(() => {