Merge branch 'master' of git.linux-help.org:psi-jack/my-yadm

This commit is contained in:
Eric Renfro 2022-06-13 15:16:08 -04:00
commit 880ea76474
Signed by: psi-jack
GPG key ID: 14977F3A50D9A5BF

View file

@ -20,4 +20,4 @@
helper = osxkeychain helper = osxkeychain
[pull] [pull]
rebase = false rebase = false
ff = no ff = only