Rebase on top of upstream/develop
This commit is contained in:
parent
8e2d85de7f
commit
7698adfd77
1 changed files with 0 additions and 3 deletions
3
yadm
3
yadm
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue