diff options
| author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-23 21:43:06 +0200 |
|---|---|---|
| committer | Jakub Kądziołka <kuba@kadziolka.net> | 2020-07-23 21:43:06 +0200 |
| commit | d726b954baaeff876ce9728e00920fa45f529f9a (patch) | |
| tree | 4b767b7586a1082dd2691bc33c3e45ace044e6e5 /.gitignore | |
| parent | 9a74a7db8626bc139307d115f5cec2648f5273ad (diff) | |
| parent | e165a2492d73d37c8b95d6970d453b9d88911ee6 (diff) | |
| download | guix-patches-d726b954baaeff876ce9728e00920fa45f529f9a.tar guix-patches-d726b954baaeff876ce9728e00920fa45f529f9a.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/ruby.scm
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore index 05a68b69ff..f630444a0f 100644 --- a/.gitignore +++ b/.gitignore @@ -66,6 +66,7 @@ /doc/stamp-vti /doc/version.texi /doc/version-*.texi +/etc/committer.scm /etc/gnu-store.mount /etc/guix-daemon.cil /etc/guix-daemon.conf @@ -88,17 +89,8 @@ /m4/nls.m4 /m4/po.m4 /m4/progtest.m4 -/nix-setuid-helper -/nix/AUTHORS -/nix/COPYING /nix/config.h /nix/config.h.in -/nix/nix-daemon/nix-daemon.cc -/nix/nix-setuid-helper/nix-setuid-helper.cc -/nix/scripts/authenticate -/nix/scripts/list-runtime-roots -/nix/scripts/offload -/nix/scripts/substitute /po/doc/*.mo /po/guix/*.gmo /po/guix/*.insert-header |