summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2018-02-14 03:40:08 -0500
committerMark H Weaver <mhw@netris.org>2018-02-14 03:40:08 -0500
commit932c98326daa26657c970e38583f7904364cdd66 (patch)
treeea4b5f9cc2ee4460a119101d83ecfd0a70a44fb7 /.gitignore
parent870541d6a7617e127f0aa9f729fba4daa729fd91 (diff)
parent75538328c292263a0c13bef3b0058aa291aeec48 (diff)
Merge branch 'master' into core-updates
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 09dbde82fc..4a110fb1f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@
/doc/os-config-desktop.texi
/doc/stamp-vti
/doc/version.texi
+/etc/guix-daemon.cil
/etc/guix-daemon.conf
/etc/guix-daemon.service
/etc/guix-publish.conf