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*