diff options
| author | http://danieroux.com/ <danieroux@web> | 2010-07-05 08:23:20 +0000 |
|---|---|---|
| committer | Joey Hess <joey@finch.kitenet.net> | 2010-07-05 08:23:20 +0000 |
| commit | bb216ff0ad183981b5f9be74ccaaf9ef72617922 (patch) | |
| tree | e40c0eec89132ceccf7a54bdbd894adf6cdcf178 | |
| parent | 527c169ab2a6617138da2c4b817e452db65f80bf (diff) | |
| -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. |