summaryrefslogtreecommitdiff
path: root/doc/todo
diff options
context:
space:
mode:
authorJoey Hess2017-07-28 20:19:46 -0400
committerJoey Hess2017-07-28 20:19:46 -0400
commit91fdbf35886b88930162aaa8e68078ba34dee180 (patch)
tree5f2fd8f10ea25ac6049348754b0634792bc5248c /doc/todo
parent4b2eb5f267769ddb9f0d21201418ed14d126e99e (diff)
merge
Diffstat (limited to 'doc/todo')
-rw-r--r--doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn b/doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn
index 62f619db..d37d6806 100644
--- a/doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn
+++ b/doc/todo/sbuild_setup_should_use_apt-cacher-ng.mdwn
@@ -18,3 +18,5 @@ Sample text for changelog/description of changes:
Please compare both your config.hs and your ~/.sbuildrc against the haddock.
--spwhitton
+
+> merge [[done]] --[[Joey]]