summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/sandbox.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index dee1b054e..af357f4dc 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -108,3 +108,6 @@ Test.. I was looking for a wiki supporting OpenID~
----
me too...
+
+
+This is a test for conflict2 \ No newline at end of file