urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

master
http://danieroux.com/ 2010-07-05 08:23:20 +00:00 committed by Joey Hess
parent 527c169ab2
commit bb216ff0ad
1 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/sandbox.mdwn
View File

@ -1,15 +1,5 @@
This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!version ]]). 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 a blockquote.
> >
> This is the first level of quoting. > This is the first level of quoting.