From c4bcceb3580c1edff6689acd0a7ad78f63a78a41 Mon Sep 17 00:00:00 2001
From: ArneBo <arne@ecobasa.org>
Date: Wed, 2 Apr 2025 03:52:24 +0200
Subject: [PATCH] fix(merge): resolved conflict

---
 front/src/components/common/RenderedDescription.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/front/src/components/common/RenderedDescription.vue b/front/src/components/common/RenderedDescription.vue
index 201a71f41..9c0e121ae 100644
--- a/front/src/components/common/RenderedDescription.vue
+++ b/front/src/components/common/RenderedDescription.vue
@@ -100,11 +100,7 @@ const submit = async () => {
       <a
         v-if="showMore === false"
         class="more"
-<<<<<<< HEAD
-        style="align-self:end; color: var(--fw-primary);"
-=======
         style="align-self: end; color: var(--fw-primary);"
->>>>>>> 1684a8660 (chore(front): correct types and layout for profiles)
         href=""
         @click.stop.prevent="showMore = true"
       >
@@ -113,11 +109,7 @@ const submit = async () => {
       <a
         v-else
         class="more"
-<<<<<<< HEAD
-        style="align-self:end; color: var(--fw-primary);"
-=======
         style="align-self: end; color: var(--fw-primary);"
->>>>>>> 1684a8660 (chore(front): correct types and layout for profiles)
         href=""
         @click.stop.prevent="showMore = false"
       >