first cut at svn merge and conflict

[ikiwiki.git] / templates / page.tmpl

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 4531157ba8146c6673c281717a1714c4a073f979..5bd71dd2f0a70a898c3adcc118ee11f71ae5cd54 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -10,15 +10,15 @@
 </h1>
 
 <TMPL_IF NAME="EDITURL">
-<a href="<TMPL_VAR EDITURL>">Edit</a>
+<a href="<TMPL_VAR EDITURL>">Edit</a>&nbsp;
 </TMPL_IF>
 
 <TMPL_IF NAME="RECENTCHANGESURL">
-<a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a>
+<a href="<TMPL_VAR RECENTCHANGESURL>">RecentChanges</a>&nbsp;
 </TMPL_IF>
 
 <TMPL_IF NAME="HISTORYURL">
-<a href="<TMPL_VAR HISTORYURL>">History</a>
+<a href="<TMPL_VAR HISTORYURL>">History</a>&nbsp;
 </TMPL_IF>
 
 <TMPL_VAR DISCUSSIONLINK><br>