Fixed: merge conflict issue(#209)

hotwax · Feb 8, 2024 · 3e273ed · 3e273ed
1 parent b129d75
commit 3e273ed
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 8 deletions.
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -25,10 +25,7 @@
   "inventory variance": "inventory variance", 
   "Instance Url": "Instance Url",
   "Item added to upload list": "Item added to upload list",
-<<<<<<< HEAD
-=======
   "Item removed from upload list":"Item removed from upload list",
->>>>>>> 036b52ecd1964586ccbdf01a92dbb419c727accc
   "Loading": "Loading",
   "Location": "Location",
   "Log variance": "Log variance",

diff --git a/src/views/Upload.vue b/src/views/Upload.vue
@@ -70,14 +70,9 @@ import { computed, defineComponent } from 'vue';
 import { colorPaletteOutline, resize, cloudUploadOutline } from 'ionicons/icons';
 import { mapGetters, useStore } from 'vuex';
 import { useRouter } from 'vue-router';
-<<<<<<< HEAD
-import { ShopifyImg } from '@hotwax/dxp-components';
-  import { Actions, hasPermission } from '@/authorization'
-=======
 import { getProductIdentificationValue, DxpShopifyImg , useProductIdentificationStore } from '@hotwax/dxp-components';
 import { Actions, hasPermission } from '@/authorization';
 import { showToast } from '@/utils';
->>>>>>> 036b52ecd1964586ccbdf01a92dbb419c727accc
 
 export default defineComponent({
   name: "Upload",