diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 21:28:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-09-13 21:28:01 +0200 |
| commit | 75710da66710cef1d32053cd8f350d13057d02a7 (patch) | |
| tree | abef6a326c741b1eb18db866b2f2bacee3e5fc51 /.gitignore | |
| parent | ab20c2cc33063ce783515d8ae7899ec7e2ca6f96 (diff) | |
| parent | 610075f7c94c80b8321887b7ccf8bb1a7edd2b8e (diff) | |
| download | guix-75710da66710cef1d32053cd8f350d13057d02a7.tar guix-75710da66710cef1d32053cd8f350d13057d02a7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 4547557631..a363c074ca 100644 --- a/.gitignore +++ b/.gitignore @@ -120,8 +120,7 @@ GTAGS /emacs/Makefile /emacs/guix-autoloads.el /emacs/guix-helper.scm -/emacs/guix-init.el -/emacs/guix-profiles.el +/emacs/guix-config.el /doc/os-config-bare-bones.texi /doc/os-config-desktop.texi /doc/*.1 |