Skip to content

Commit

Permalink
fix: added name to ConflictPicker dialog
Browse files Browse the repository at this point in the history
  • Loading branch information
emoral435 committed Mar 14, 2024
1 parent ff6706d commit 54fe138
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions lib/components/ConflictPicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
<NcDialog class="conflict-picker"
data-cy-conflict-picker
:close-on-click-outside="false"
:canClose="false"
:can-close="false"
:show="opened"
:name="name"
size="large"
@close="onCancel">
<!-- Header -->
<div class="conflict-picker__header">
<h2 class="conflict-picker__title" v-text="name" />

<!-- Description -->
<p id="conflict-picker-description" class="conflict-picker__description">
{{ t('Which files do you want to keep?') }}<br>
Expand Down

0 comments on commit 54fe138

Please sign in to comment.