diff options
| -rw-r--r-- | src/views/applications/mergeConflict.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/views/applications/mergeConflict.vue b/src/views/applications/mergeConflict.vue index 7fc47c9..1cd7764 100644 --- a/src/views/applications/mergeConflict.vue +++ b/src/views/applications/mergeConflict.vue @@ -77,7 +77,7 @@ <p> {{ t('application.resolve_commit', { - branch: detailData.targetBranch, + branch: detailData.sourceBranch, }) }} </p> |