Rebase on top of upstream/develop

2025-12-06 14:42:14 +00:00 · 2020-02-17 09:31:45 +01:00 · 2020-02-17 09:31:45 +01:00 · 63ed2b3aea
commit 63ed2b3aea
parent b00cc9545d
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@ -1170,11 +1170,8 @@ yadm.auto-alt
 yadm.auto-exclude
 yadm.auto-perms
 yadm.auto-private-dirs
-<<<<<<< HEAD
-=======
 yadm.cygwin-copy
 yadm.cypher
->>>>>>> local
 yadm.git-program
 yadm.gpg-perms
 yadm.gpg-program