diff options
| author | korelstar <korelstar@users.noreply.github.com> | 2021-11-12 18:26:28 +0300 |
|---|---|---|
| committer | korelstar <korelstar@users.noreply.github.com> | 2021-11-12 21:53:45 +0300 |
| commit | 3c3346688bb1237df5e69a5be96db0a8eb93fc69 (patch) | |
| tree | 72dd8fe8e151f45d546d9ea7a8ca18974d6ea538 /src | |
| parent | 780bb9b5bf8aef69e073d8f8c0216ba6dff6ca68 (diff) | |
update dependencies
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/ConflictSolution.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/ConflictSolution.vue b/src/components/ConflictSolution.vue index 535570e7..b2993bb1 100644 --- a/src/components/ConflictSolution.vue +++ b/src/components/ConflictSolution.vue @@ -3,7 +3,7 @@ <div class="text"> <pre v-for="(l, i) in diff" :key="i" :class="l.className">{{ l.line }}</pre> </div> - <button @click="$emit('onChooseSolution')"> + <button @click="$emit('on-choose-solution')"> {{ button }} </button> </div> |