Merge branch 'master' of git://github.com/alanpearce/dotfiles Conflicts: install
1 file changed, 2 insertions(+), 0 deletions(-)
changed files
M global.gitignore → global.gitignore
@@ -18,6 +18,8 @@ auto-save-list tramp .\#* +.envrc + # Org-mode .org-id-locations *_archive