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:37:30 +01:00
parent 5e58d6e312
commit 22af8012f5
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/src/pages/CreationConfirm.vue
View File

@ -1,9 +1,6 @@
<template> <template>
<div class="creation-confirm"> <div class="creation-confirm">
<div v-if="overlay" id="overlay" @dblclick="overlay = false"> <div v-if="overlay" id="overlay" @dblclick="overlay = false">
<<<<<<< Updated upstream
<overlay :item="item" @overlay-cancel="overlay = false" @confirm-creation="confirmCreation" />
=======
<overlay :item="item" @overlay-cancel="overlay = false"> <overlay :item="item" @overlay-cancel="overlay = false">
<template #title> <template #title>
{{ $t(overlayTitle) }} {{ $t(overlayTitle) }}
@ -25,7 +22,6 @@
</b-button> </b-button>
</template> </template>
</overlay> </overlay>
>>>>>>> Stashed changes
</div> </div>
<open-creations-table <open-creations-table
class="mt-4" class="mt-4"