From 5e58d6e31274079f2eacdbae229ddecd6cd53b29 Mon Sep 17 00:00:00 2001
From: elweyn <heine.hannes@gmail.com>
Date: Wed, 25 Jan 2023 14:36:55 +0100
Subject: [PATCH] Correct merged stash conflicts.

---
 admin/src/components/Overlay.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/admin/src/components/Overlay.vue b/admin/src/components/Overlay.vue
index c359178ec..3cb09ed1b 100644
--- a/admin/src/components/Overlay.vue
+++ b/admin/src/components/Overlay.vue
@@ -38,13 +38,8 @@
       <b-container>
         <b-row>
           <b-col>
-<<<<<<< Updated upstream
-            <b-button size="md" variant="danger" class="m-3" @click="$emit('overlay-cancel')">
-              {{ $t('overlay.confirm.cancel') }}
-=======
             <b-button size="md" variant="info" class="m-3" @click="$emit('overlay-cancel')">
               {{ $t('overlay.cancel') }}
->>>>>>> Stashed changes
             </b-button>
           </b-col>
           <b-col class="text-right">