diff options
Diffstat (limited to 'doc/sandbox.mdwn')
| -rw-r--r-- | doc/sandbox.mdwn | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 8ecaf1cb9..4c8621f1c 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -1,5 +1,11 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). +<<<<<<< HEAD +Test conflict. +======= +Testing 123. +>>>>>>> 8cc8bb52f7913e429be7e14203177ef374645718 + # Header ## Subheader2 |