summaryrefslogtreecommitdiff
path: root/HACKING
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-11-07 21:33:32 +0100
committerMarius Bakke <marius@gnu.org>2020-11-07 21:33:32 +0100
commit32787d652460871a79f99b63230f92759e2e0de2 (patch)
treece883cac0d602b10b7c005755d035a08197e73a9 /HACKING
parent052939c2f6e36de00a5e756ea29a4cc96884a55d (diff)
parentc2396ceb6eb30ac87755eb8b39583403b35fbd12 (diff)
downloadguix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar
guix-patches-32787d652460871a79f99b63230f92759e2e0de2.tar.gz
Merge branch 'master' into staging
Conflicts: gnu/local.mk gnu/packages/gdb.scm gnu/packages/lisp-xyz.scm gnu/packages/web-browsers.scm
Diffstat (limited to 'HACKING')
-rw-r--r--HACKING2
1 files changed, 1 insertions, 1 deletions
diff --git a/HACKING b/HACKING
index aaa673fc93..9adef201c2 100644
--- a/HACKING
+++ b/HACKING
@@ -13,7 +13,7 @@ Copyright © 2017 Arun Isaac <arunisaac@systemreboot.net>
* Contributing
-See the manual for useful hacking informations, either by running
+See the manual for useful hacking information, either by running
info -f doc/guix.info "Contributing"