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 merge conflicts.

Browse Source
This commit is contained in:
elweyn 2023-01-25 14:41:03 +01:00
parent 22af8012f5
commit dc70a375f6
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,4 @@
<!-- eslint-disable @intlify/vue-i18n/no-dynamic-keys -->
<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">
@ -155,8 +156,6 @@ export default {
{ key: 'deny', label: this.$t('deny') }, { key: 'deny', label: this.$t('deny') },
] ]
}, },
<<<<<<< Updated upstream
=======
overlayTitle() { overlayTitle() {
return `overlay.${this.variant}.title` return `overlay.${this.variant}.title`
}, },
@ -184,7 +183,6 @@ export default {
return 'info' return 'info'
} }
}, },
>>>>>>> Stashed changes
}, },
apollo: { apollo: {
PendingContributions: { PendingContributions: {