chore: post merge conflict

enkryptcom · Oct 23, 2024 · c07d1b7 · c07d1b7 · github-actions · Oct 23, 2024
1 parent 30933a1
commit c07d1b7
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category.vue b/packages/extension/src/ui/action/views/network-nfts/components/network-nfts-category.vue
@@ -40,22 +40,13 @@
 </template>
 
 <script setup lang="ts">
-<<<<<<< HEAD
 import { computed, PropType, ref } from "vue";
 import NetworkNftsItem from "./network-nfts-item.vue";
 import NftSortMenu from "@action/icons/nft/nft-sort-menu.vue";
 import NetworkNftsCategorySortMenu from "./network-nfts-category-sort-menu.vue";
 import { NFTCollection } from "@/types/nft";
 import { onClickOutside } from "@vueuse/core";
 import Tooltip from "@/ui/action/components/tooltip/index.vue";
-=======
-import { computed, PropType, ref } from 'vue';
-import NetworkNftsItem from './network-nfts-item.vue';
-import NftSortMenu from '@action/icons/nft/nft-sort-menu.vue';
-import NetworkNftsCategorySortMenu from './network-nfts-category-sort-menu.vue';
-import { NFTCollection } from '@/types/nft';
-import { onClickOutside } from '@vueuse/core';
->>>>>>> devop/vite-migrate
 
 const isOpenSort = ref(false);
 const isAbcSort = ref(true);