psi-jack/yadm
1
0
Fork 0
mirror of synced 2025-01-07 05:32:17 -05:00
Code Issues Releases Wiki Activity

Rebase on top of upstream/develop

Browse source
This commit is contained in:
Luis López 2020-02-17 09:31:45 +01:00 committed by Tim Byrne
parent 8e2d85de7f
commit 7698adfd77
No known key found for this signature in database
GPG key ID: 14DB4FC2465A4B12
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
yadm
View file

@ -1170,11 +1170,8 @@ yadm.auto-alt
yadm.auto-exclude yadm.auto-exclude
yadm.auto-perms yadm.auto-perms
yadm.auto-private-dirs yadm.auto-private-dirs
<<<<<<< HEAD
=======
yadm.cygwin-copy yadm.cygwin-copy
yadm.cypher yadm.cypher
>>>>>>> local
yadm.git-program yadm.git-program
yadm.gpg-perms yadm.gpg-perms
yadm.gpg-program yadm.gpg-program