Merge branch 'master' of github.com:asmaps/dotfiles

Conflicts:
	gitconfig
master
Arne Schauf 10 years ago
commit 2b1c2f41bb
  1. 2
      gitconfig

@ -13,4 +13,4 @@
[color] [color]
ui = true ui = true
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore

Loading…
Cancel
Save