diff options
| author | Alan Pearce | 2014-04-01 19:05:41 +0100 |
|---|---|---|
| committer | Alan Pearce | 2014-04-01 19:05:41 +0100 |
| commit | e5a860c3b64437f3766cc6ea5af0a1111800635f (patch) | |
| tree | d583cdd0a11151902f5a904f333092f849514715 /global.gitignore | |
| parent | 325426abd41894fad8e1264d72593f03d4e5cc8c (diff) | |
| parent | 01790538eeb0bbd0a5be4716fa6187e6350a9e89 (diff) | |
| download | dotfiles-e5a860c3b64437f3766cc6ea5af0a1111800635f.tar.lz dotfiles-e5a860c3b64437f3766cc6ea5af0a1111800635f.tar.zst dotfiles-e5a860c3b64437f3766cc6ea5af0a1111800635f.zip | |
Merge branch 'master' of git://github.com/alanpearce/dotfiles
Conflicts: install
Diffstat (limited to 'global.gitignore')
| -rw-r--r-- | global.gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/global.gitignore b/global.gitignore index 78d8d16..7e23dca 100644 --- a/global.gitignore +++ b/global.gitignore @@ -18,6 +18,8 @@ auto-save-list tramp .\#* +.envrc + # Org-mode .org-id-locations *_archive |