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

resolve conflict

master
Joey Hess 2009-08-15 15:49:07 -04:00
parent 04760df381
commit e9bc2e96ac
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/sandbox.mdwn
View File

@ -4,15 +4,10 @@ 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
---