From 699ee8bb63480018420123d9833786f51d2c7f07 Mon Sep 17 00:00:00 2001
From: Frikki Boy <aiagent@aleksandrdovbysh.ru>
Date: Fri, 24 Apr 2026 23:35:40 +0300
Subject: [PATCH] vault backup: 2026-04-24 23:35:39

---
 .gitignore                               | 3 +++
 .obsidian/plugins/obsidian-git/data.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 8615dee..e19eb79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 .obsidian/workspace.json
 .obsidian/workspace-mobile.json
 .DS_Store
+.obsidian/graph.json
+.obsidian/hotkeys.json
+.obsidian/*.sync-*
\ No newline at end of file
diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index fde1bde..b700a96 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -17,7 +17,7 @@
   "showStatusBar": true,
   "updateSubmodules": false,
   "syncMethod": "merge",
-  "mergeStrategy": "none",
+  "mergeStrategy": "theirs",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
   "treeStructure": false,