committing changes for conflict test

[git.ikiwiki.info.git] / doc / index / discussion.mdwn

diff --git a/doc/index/discussion.mdwn b/doc/index/discussion.mdwn
index 2e3b545d85a779f639f25bb257495157039411e8..34d0cf048edf229a80d324df5db62417b99ba1d2 100644 (file)
--- a/doc/index/discussion.mdwn
+++ b/doc/index/discussion.mdwn
@@ -1,4 +1,4 @@
-This [subpage] is a discussion page for [[ikiwiki]]. Feel free to discuss anything about the program here.
+This [[SubPage]] is a discussion page for ikiwiki. Feel free to discuss anything about the program here.

 
 ----
 
 
 ----