summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/sandbox.mdwn2
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index af357f4dc..81bbbdea7 100644
--- 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