From c397c173f33d2b707c4da3fe9866f4bbdad94bed Mon Sep 17 00:00:00 2001 From: tiagoarroz Date: Wed, 6 May 2026 09:06:12 +0100 Subject: [PATCH] Fix conflict spelling in log auto-resolve setting --- src/settings/tab.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/settings/tab.ts b/src/settings/tab.ts index 0eccb27..cca35fc 100644 --- a/src/settings/tab.ts +++ b/src/settings/tab.ts @@ -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