web commit by http://nicholas.allen.myopenid.com/

[ikiwiki.git] / doc / sandbox.mdwn

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index af357f4dce35684ce92b83575ca704016901fd21..81bbbdea756bfc4e008a4529075e3c0199ff3987 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -109,5 +109,3 @@ Test.. I was looking for a wiki supporting OpenID~
 ----
 me too...
 
-
-This is a test for conflict2
\ No newline at end of file