(no commit message)

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 40484f011e970a25710f957ee64764ba67f9dd0f..5e9c052258ae5fa159e537b0224ff05be6e2bd75 100644 (file)
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,9 +4,15 @@ This is the [[SandBox]], a page anyone can edit to try out ikiwiki (version [[!v
 2009/7/13 Monday Blue...\\
 While working on [[http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199|[97] Phpbb 與 Dokuwiki 之間的往來]] (External Link to //http://eoffice.im.fju.edu.tw/phpbb/viewtopic.php?p=27199// not working?), surf Internet for Wikis supporting //Creole V1.0//, found this site.
 
+<<<<<<< HEAD:doc/sandbox.mdwn
 * I thought that creole markup is used by ikiwiki...
 * Thought about using //SVN/CVS// server, however with different idea
 * Kinda curious why **Tcl** does not show her face in this Wiki arena
+=======
+* Thought about using //SVN/CVS// server, however with different idea
+* Kinda curious why **Tcl** does not show her face in this Wiki arena
+* It looks like that I was wrong, from Wikipedia Creole page it mention that ikiwiki is also adopting Creole markup.
+>>>>>>> 55c1a37cce91d4fd01bf80fcaeeaf56535218a5c:doc/sandbox.mdwn
 
 ----