diff options
| author | zyh <[email protected]> | 2024-11-13 17:28:29 +0800 |
|---|---|---|
| committer | zyh <[email protected]> | 2024-11-13 17:28:29 +0800 |
| commit | 5a031b6199e92bcd635c38ad5e4bf17e43ea264c (patch) | |
| tree | f72757ee96d6a2f822fd902c0f9fc3ee8df90884 | |
| parent | 4d68372ba97b50f089eb11581b77ec0d8b09d0c8 (diff) | |
fix: 修复解决冲突页面描述错误
| -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> |