Merge branch 'master-nonedit' into master-nonedit-damaster-nonedit-da

Conflicts (manually resolved):
	page.tmpl

1 files changed, 0 insertions, 11 deletions

diff --git a/page.tmpl b/page.tmpl
index e1ee543..acafe7c 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -56,9 +56,6 @@
 <TMPL_IF HAVE_ACTIONS>
 <TMPL_IF HTML5><nav class="actions"><TMPL_ELSE><div class="actions"></TMPL_IF>
 <ul>
-<TMPL_IF EDITURL>
-<li><a href="<TMPL_VAR EDITURL>" rel="nofollow">Edit</a></li>
-</TMPL_IF>
 <TMPL_IF RECENTCHANGESURL>
 <li><a href="<TMPL_VAR RECENTCHANGESURL>">SenesteRettelser</a></li>
 </TMPL_IF>
@@ -68,14 +65,6 @@
 <TMPL_IF GETSOURCEURL>
 <li><a href="<TMPL_VAR GETSOURCEURL>">Kilde</a></li>
 </TMPL_IF>
-<TMPL_IF PREFSURL>
-<li><a href="<TMPL_VAR PREFSURL>">Indstillinger</a></li>
-</TMPL_IF>
-<TMPL_IF ACTIONS>
-<TMPL_LOOP ACTIONS>
-<li><TMPL_VAR ACTION></li>
-</TMPL_LOOP>
-</TMPL_IF>
 <TMPL_IF COMMENTSLINK>
 <li><TMPL_VAR COMMENTSLINK></li>
 <TMPL_ELSE>