summaryrefslogtreecommitdiff
path: root/doc/sandbox.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/sandbox.mdwn')
-rw-r--r--doc/sandbox.mdwn4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 83e9a77fe..cc37a9978 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,8 +4,7 @@ See [[MarkDown]] for documentation of the markup syntax used on this page.
----
-Here's a paragraph. This is a confict test; I'm also editing this line on
-the web.
+Here's a paragraph. This is a conflict test edit.......
Here's another one with *emphasised* text.
@@ -34,7 +33,6 @@ Bulleted list
* item
* just to try this stuff - looks kool!
* test
-* hi mom!
[[WikiLink]]