From dc70a375f6a1b4228c29b96fd32cd44ec4fa840f Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 25 Jan 2023 14:41:03 +0100
Subject: [PATCH] Correct merge conflicts.

---
 admin/src/pages/CreationConfirm.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 1c5a60c83..1cbebf5bd 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -1,3 +1,4 @@
+<!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys -->
 <template>
   <div class="creation-confirm">
     <div v-if="overlay" id="overlay" @dblclick="overlay = false">
@@ -155,8 +156,6 @@ export default {
         { key: 'deny', label: this.$t('deny') },
       ]
     },
-<<<<<<< Updated upstream
-=======
     overlayTitle() {
       return `overlay.${this.variant}.title`
     },
@@ -184,7 +183,6 @@ export default {
           return 'info'
       }
     },
->>>>>>> Stashed changes
   },
   apollo: {
     PendingContributions: {