summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2015-07-19 18:12:34 -0400
committerMark H Weaver <mhw@netris.org>2015-07-19 18:12:34 -0400
commit1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f (patch)
tree4b650999e49a6f4d3dd116fab3f9ee8222247e07 /.gitignore
parentaa27987f71cb8afa698ede551e20b1248f160113 (diff)
parent50c7a1e297bff0935674b4f30e854a8889becfdd (diff)
downloadpatches-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar
patches-1b4e48d498a96d478baa1aae7d9c7ecdbd817d6f.tar.gz
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 c1061d73e5..c7a6cddaa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -125,3 +125,4 @@ GTAGS
/doc/os-config-bare-bones.texi
/doc/os-config-desktop.texi
/doc/*.1
+/etc/guix-daemon.service