diff options
author | Ludovic Courtès <ludo@gnu.org> | 2015-12-12 11:42:12 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2015-12-12 11:48:46 +0100 |
commit | e82e55e58c67b0215e768c4612ca542bc670f633 (patch) | |
tree | 856c4512fa1fbde59c1d9845c5a763ef8c4a14b4 /.gitignore | |
parent | 98bd851ee891ca4a84e061fe1e78ba78c292b096 (diff) | |
parent | e35dff973375266db253747140ddf25084ecddc2 (diff) | |
download | guix-e82e55e58c67b0215e768c4612ca542bc670f633.tar guix-e82e55e58c67b0215e768c4612ca542bc670f633.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 6e8bfaca95..412d09ca11 100644 --- a/.gitignore +++ b/.gitignore @@ -125,6 +125,7 @@ GTAGS /doc/os-config-desktop.texi /doc/*.1 /etc/guix-daemon.service +/etc/guix-daemon.conf /doc/images/bootstrap-graph.pdf /doc/images/coreutils-bag-graph.png /doc/images/coreutils-graph.png |