Merge branch 'master' of git://github.com/joeyh/ikiwiki

1 files changed, 17 insertions, 5 deletions

diff --git a/doc/sandbox.mdwn b/doc/sandbox.mdwn
index 9b0a53c68..96b880b34 100644
--- a/doc/sandbox.mdwn
+++ b/doc/sandbox.mdwn
@@ -4,16 +4,18 @@ 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
 
+---
+
+Guten Morgen aus Deutschland. Wir mögen Umläuter (ich weiß, der Plural ist falsch, aber dafür hat er einen). Die sind heutzutage kein Ärgernis mehr.
+
+&amp;#x263a; becomes &#x263a; 
+
+<script>alert("If this pops, ikiwiki is not cross site scripting safe."); /* Fortunately, this does not work. */</script>
 
 --- 
 I try to have a discussion page !!!
@@ -169,3 +171,13 @@ testing
 [[!toc  levels=2]]
 
 [[Mamma Mia]]
+
+----
+
+[[!format  c """
+void main () {
+    printf("hello, world!");
+}
+"""]]
+
+