From 5e3020e719fb94a43e2c74d8cc30ed8e4c84a8a3 Mon Sep 17 00:00:00 2001 From: tiagoarroz Date: Tue, 5 May 2026 09:43:35 +0100 Subject: [PATCH] Translate log conflict comment to English --- src/sync-manager.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sync-manager.ts b/src/sync-manager.ts index 9358313..b8ac9bc 100644 --- a/src/sync-manager.ts +++ b/src/sync-manager.ts @@ -460,10 +460,10 @@ export default class SyncManager { .map((conflict) => ({ filePath: conflict.filePath, content: conflict.localContent, - })); + })); if (logConflictResolutions.length > 0) { - // Os logs são específicos de cada cofre e podem mudar em cada execução, - // por isso estes conflitos são resolvidos mantendo sempre o conteúdo local. + // Logs are specific to each vault and can change on every run, + // so these conflicts are always resolved by keeping local content. await this.logger.info( "Automatically resolved log conflicts", logConflictResolutions.map((resolution) => resolution.filePath),