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