MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(merge): resolved conflict

This commit is contained in:
ArneBo 2025-04-02 03:52:24 +02:00
parent efe5674d04
commit c4bcceb358
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
front/src/components/common/RenderedDescription.vue
View File

@ -100,11 +100,7 @@ const submit = async () => {
<a <a
v-if="showMore === false" v-if="showMore === false"
class="more" class="more"
<<<<<<< HEAD
style="align-self:end; color: var(--fw-primary);"
=======
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="" href=""
@click.stop.prevent="showMore = true" @click.stop.prevent="showMore = true"
> >
@ -113,11 +109,7 @@ const submit = async () => {
<a <a
v-else v-else
class="more" class="more"
<<<<<<< HEAD
style="align-self:end; color: var(--fw-primary);"
=======
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="" href=""
@click.stop.prevent="showMore = false" @click.stop.prevent="showMore = false"
> >