diff options
author | Leo Famulari <leo@famulari.name> | 2016-11-26 16:21:47 -0500 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-11-26 16:21:47 -0500 |
commit | a282cdae107c8aec512b563f25dd411183ef2830 (patch) | |
tree | 3359e7101ba120cb6d2dbd156327edd727bcc01a /.gitignore | |
parent | 3ad8cb4163deee77882ee4bded83a548752b896f (diff) | |
parent | cd65d600ac6e8701ef9c54f5d09a45cd6c149949 (diff) | |
download | guix-a282cdae107c8aec512b563f25dd411183ef2830.tar guix-a282cdae107c8aec512b563f25dd411183ef2830.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 329d489713..b64f5ef4b0 100644 --- a/.gitignore +++ b/.gitignore @@ -50,6 +50,8 @@ /emacs/guix-helper.scm /etc/guix-daemon.conf /etc/guix-daemon.service +/etc/guix-publish.conf +/etc/guix-publish.service /guix-daemon /guix-register /guix/config.scm |