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