mirror of
https://github.com/silvanocerza/github-gitless-sync.git
synced 2026-07-22 12:10:28 +00:00
Fix conflict spelling in log auto-resolve setting
This commit is contained in:
parent
5e3020e719
commit
c397c173f3
1 changed files with 2 additions and 2 deletions
|
|
@ -190,9 +190,9 @@ export default class GitHubSyncSettingsTab extends PluginSettingTab {
|
|||
});
|
||||
|
||||
new Setting(containerEl)
|
||||
.setName("Automatically resolve conflits in logs")
|
||||
.setName("Automatically resolve conflicts in logs")
|
||||
.setDesc(
|
||||
"Automatically resolves conflits in this plugin's logs prioritizing the local file",
|
||||
"Automatically resolves conflicts in this plugin's logs prioritizing the local file",
|
||||
)
|
||||
.addToggle((toggle) => {
|
||||
toggle
|
||||
|
|
|
|||
Loading…
Reference in a new issue