From 6dc29ca72a890bb16542ff1e795fea5aa642e420 Mon Sep 17 00:00:00 2001 From: joey Date: Sun, 19 Mar 2006 20:10:58 +0000 Subject: [PATCH] committing changes for conflict test --- doc/sandbox.mdwn | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 7a47a34e3..83e9a77fe 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -4,7 +4,8 @@ See [[MarkDown]] for documentation of the markup syntax used on this page. ---- -Here's a paragraph. +Here's a paragraph. This is a confict test; I'm also editing this line on +the web. Here's another one with *emphasised* text. @@ -33,6 +34,7 @@ Bulleted list * item * just to try this stuff - looks kool! * test +* hi mom! [[WikiLink]]