aboutsummaryrefslogtreecommitdiff
path: root/src/components/desktop_nav/desktop_nav.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/desktop_nav/desktop_nav.vue
parent18d69f93d38dc15a74db81ee4c10b4766bebfc35 (diff)
parent610720f164dc9fcf36f9df33bddec5ac9c654e1e (diff)
Fix merge conflicts
Diffstat (limited to 'src/components/desktop_nav/desktop_nav.vue')
-rw-r--r--src/components/desktop_nav/desktop_nav.vue2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/desktop_nav/desktop_nav.vue b/src/components/desktop_nav/desktop_nav.vue
index bab3ca81..f352c78c 100644
--- a/src/components/desktop_nav/desktop_nav.vue
+++ b/src/components/desktop_nav/desktop_nav.vue
@@ -38,7 +38,7 @@
/>
<button
class="button-unstyled nav-icon"
- @click.stop="openSettingsModal"
+ @click="openSettingsModal"
>
<FAIcon
fixed-width