aboutsummaryrefslogtreecommitdiff
path: root/src/components/settings_modal/settings_modal.vue
diff options
context:
space:
mode:
authorSean King <seanking2919@protonmail.com>2022-08-06 22:02:21 -0600
committerSean King <seanking2919@protonmail.com>2022-08-06 22:02:21 -0600
commitdc9951d400fc6f4e9080d29589bf186fb081f4f6 (patch)
tree06491c209236128adaf47644babd2ade44c490e3 /src/components/settings_modal/settings_modal.vue
parent18d69f93d38dc15a74db81ee4c10b4766bebfc35 (diff)
parent610720f164dc9fcf36f9df33bddec5ac9c654e1e (diff)
Fix merge conflicts
Diffstat (limited to 'src/components/settings_modal/settings_modal.vue')
-rw-r--r--src/components/settings_modal/settings_modal.vue4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/settings_modal/settings_modal.vue b/src/components/settings_modal/settings_modal.vue
index d3bed061..7b457371 100644
--- a/src/components/settings_modal/settings_modal.vue
+++ b/src/components/settings_modal/settings_modal.vue
@@ -53,7 +53,7 @@
:bound-to="{ x: 'container' }"
remove-padding
>
- <template v-slot:trigger>
+ <template #trigger>
<button
class="btn button-default"
:title="$t('general.close')"
@@ -65,7 +65,7 @@
/>
</button>
</template>
- <template v-slot:content="{close}">
+ <template #content="{close}">
<div class="dropdown-menu">
<button
class="button-default dropdown-item dropdown-item-icon"