From 97829c6809ff46eee8a28d16913ac916fc4744ce Mon Sep 17 00:00:00 2001
From: Joseph Hanson <joe@veri.dev>
Date: Thu, 7 Nov 2024 22:20:12 -0600
Subject: [PATCH] ignore sync-conflicts

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 91697fa1..b074c25b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,6 @@ omniconfig.yaml
 *.pem
 *.secrets
 config.xml
+
+# syncthing
+**/*sync-conflict*