summaryrefslogtreecommitdiffstats
path: root/.gitattributes.d/midori
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2021-08-20 21:11:37 (EDT)
committer P. J. McDermott <pj@pehjota.net>2021-08-20 21:11:37 (EDT)
commitb792ed623d4bd9f64d0ee69937a7930863a0df39 (patch)
tree728e56ce7710e970b415e977a5affbb364cbfde0 /.gitattributes.d/midori
parenta927d02938fd4e581899f821c10d03062814329c (diff)
parent0848649167b70eff799eb496e2f8f3fd9b905219 (diff)
downloadmidori-b792ed623d4bd9f64d0ee69937a7930863a0df39.zip
midori-b792ed623d4bd9f64d0ee69937a7930863a0df39.tar.gz
midori-b792ed623d4bd9f64d0ee69937a7930863a0df39.tar.bz2
Merge branch 'master' of ssh://git.pehjota.net/dotfiles/midoriHEADmasterhost/alsvid2
Conflicts: .config/midori/config
Diffstat (limited to '.gitattributes.d/midori')
0 files changed, 0 insertions, 0 deletions