mirror of
https://github.com/friebetill/obsidian-file-diff.git
synced 2026-07-22 07:40:25 +00:00
Fix bug when accepting a merge
This commit is contained in:
parent
60fd218e7b
commit
2bd2e46aa2
1 changed files with 1 additions and 1 deletions
|
|
@ -73,7 +73,7 @@ export class ActionLine {
|
|||
} else if (hasPlusLines) {
|
||||
new ActionLineButton({
|
||||
text: `Accept from ${this.file2.name}`,
|
||||
onClick: (e) => this.acceptTopClick(e, this.difference),
|
||||
onClick: (e) => this.acceptBottomClick(e, this.difference),
|
||||
}).build(actionLine)
|
||||
ActionLineDivider.build(actionLine)
|
||||
new ActionLineButton({
|
||||
|
|
|
|||
Loading…
Reference in a new issue