summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-10-23 16:33:29 -0400
committerJoey Hess <joey@kitenet.net>2010-10-23 16:33:29 -0400
commit9f301569496e7d4019f41c34be5f07b828952ba8 (patch)
tree6e0e9fd33b8ed22f40e9c4538b216168ea1bb063
parent9d78e484da5c0f8734cbc26bb1a8f89617d6afe8 (diff)
parentbb8fc299acf377846caa189cd17426e4abd2ce74 (diff)
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
-rw-r--r--doc/sandbox/revert_me.mdwn2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/sandbox/revert_me.mdwn b/doc/sandbox/revert_me.mdwn
index d5fb06504..2b1cd2f94 100644
--- a/doc/sandbox/revert_me.mdwn
+++ b/doc/sandbox/revert_me.mdwn
@@ -1,3 +1 @@
this looks good
-
-ok