client brief - update file tab working

src/components/project/ClientBrief/Images.vue

@@ -10,7 +10,6 @@
         class="flex flex-col | bg-white | border border-grey-200 | text-grey-800 | font-medium | rounded-2xl"
         @click="addImages = true"
       >
-<<<<<<< HEAD
         Ajouter une ou plusieurs images
       </button>
       <figure
@@ -21,54 +20,6 @@
         <span class="tag | btn btn--sm">Tag</span>
         <img :src="image.url" alt="" />
       </figure>
-=======
-        <template #chooseicon>
-          <svg
-            width="20"
-            height="20"
-            viewBox="0 0 20 20"
-            fill="none"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M0.714355 15.0001V16.4286C0.714355 17.1864 1.01538 17.9131 1.55119 18.4489C2.08701 18.9848 2.81374 19.2858 3.5715 19.2858H16.4286C17.1864 19.2858 17.9131 18.9848 18.4489 18.4489C18.9848 17.9131 19.2858 17.1864 19.2858 16.4286V15.0001M5.71436 5.71436L10.0001 0.714355M10.0001 0.714355L14.2858 5.71436M10.0001 0.714355V13.5715"
-              stroke="currentColor"
-              stroke-width="1.25"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-            />
-          </svg>
-        </template>
-        <template
-          #content="{
-            files,
-            uploadedFiles,
-            removeUploadedFileCallback,
-            removeFileCallback,
-          }"
-        >
-          <div v-if="files.length > 0">Fichiers importés</div>
-        </template>
-      </FileUpload>
-      <Toast />
-      <template v-for="image in images" :key="image.uuid">
-        <figure
-          v-if="
-            selectedTags.length === 0 ||
-            selectedTags.some((pageSelectedTag) =>
-              image.tags.includes(pageSelectedTag)
-            )
-          "
-          @click="modal = image"
-          class="image"
-        >
-          <span v-for="tag in image.selectedTags" class="tag | btn btn--sm">{{
-            tag
-          }}</span>
-          <img :src="image.url" alt="" />
-        </figure>
-      </template>
->>>>>>> 5d1403a (client brief - update file tab working)
     </div>
 
     <Dialog