IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct merged stash conflicts.

Browse Source
This commit is contained in:
elweyn 2023-01-25 14:36:55 +01:00
parent bd9d62b2d6
commit 5e58d6e312
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/src/components/Overlay.vue
View File

@ -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">