aboutsummaryrefslogtreecommitdiffstats
path: root/mpd
diff options
context:
space:
mode:
authorYann Herklotz <git@yannherklotz.com>2022-02-27 18:29:45 +0000
committerYann Herklotz <git@yannherklotz.com>2022-02-27 18:29:45 +0000
commit22dc0efc112aab7cccac887151a9b47bf06cb1d7 (patch)
treeb9aafdc20dcbe060e265c26fbbc9a00ef6f17dbd /mpd
parent3afffe980aba1a6f4734692d1bc82f077bcbadd1 (diff)
downloaddotfiles-22dc0efc112aab7cccac887151a9b47bf06cb1d7.tar.gz
dotfiles-22dc0efc112aab7cccac887151a9b47bf06cb1d7.zip
Add better conflict resolution to git config
Diffstat (limited to 'mpd')
0 files changed, 0 insertions, 0 deletions