summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/sandbox.mdwn2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 8ecaf1cb9..b8bcc62c4 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -1,5 +1,7 @@
This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]).
+Test conflict.
+
# Header
## Subheader2