From 72f0753c30e030aabf64ee597855139105ba5995 Mon Sep 17 00:00:00 2001 From: www-data Date: Sun, 19 Mar 2006 20:17:20 +0000 Subject: [PATCH] web commit by joey: conflict test --- doc/sandbox.mdwn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index cc37a9978..963c810b2 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -4,7 +4,7 @@ See [[MarkDown]] for documentation of the markup syntax used on this page. ---- -Here's a paragraph. This is a conflict test edit....... +Here's a paragraph. test 2... Here's another one with *emphasised* text. -- 2.26.2