Removed merge particle

DH-Center-Tuebingen · Sep 19, 2024 · 4a11f1e · 4a11f1e
1 parent 0a80373
commit 4a11f1e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/resources/js/components/AttributeList.vue b/resources/js/components/AttributeList.vue
@@ -13,13 +13,8 @@
         <template #item="{ element, index }">
             <div
                 v-if="!state.hiddenAttributeList[element.id] || showHidden"
-                <<<<<<<
-                HEAD
-                class="mb-3"
-                =="====="
                 class="mb-3 px-2"
             >
-                >>>>>> master
                 :class="clFromMetadata(element)"
                 @mouseenter="onEnter(index)"
                 @mouseleave="onLeave(index)"