diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-08-15 15:49:07 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-08-15 15:49:07 -0400 |
| commit | e9bc2e96acd5977a35f338ddd392733aaca761f7 (patch) | |
| tree | a0fb8c5ddaef765a496ee7958c4d80b142dfbd7f | |
| parent | 04760df3813a1b44043176e95bcd3eae6ba0507c (diff) | |
| download | ikiwiki-e9bc2e96acd5977a35f338ddd392733aaca761f7.tar ikiwiki-e9bc2e96acd5977a35f338ddd392733aaca761f7.tar.gz | |
resolve conflict
| -rw-r--r-- | doc/sandbox.mdwn | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn index 9b0a53c68..c84d52ef2 100644 --- a/doc/sandbox.mdwn +++ b/doc/sandbox.mdwn @@ -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 --- |