summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-20 22:39:07 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-20 22:39:07 +0200
commit306eb61d606fd1ab40ef74866a14267384e0b2d6 (patch)
tree690e60780f78ff3cc744968d1f6924d491465055
parentea16b1e537ffb534d11c7d7dac262259fd03f601 (diff)
parent3e2f923e92cf5757631a0ed28223a68d38e71f6f (diff)
Merge branch 'scs' into scs-da
Conflicts (manually resolved): page.tmpl
-rw-r--r--page.tmpl1
1 files changed, 0 insertions, 1 deletions
diff --git a/page.tmpl b/page.tmpl
index 780e4e4..89ed1b7 100644
--- a/page.tmpl
+++ b/page.tmpl
@@ -34,7 +34,6 @@ isn't that nice to know? -->
<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>");</style>
<TMPL_ELSE>
<style type="text/css" media="screen">@import url("<TMPL_VAR BASEURL>local.css");</style>
-<TMPL_IF NAME="EDITURL">
</TMPL_IF>
<TMPL_IF EDITURL>
<link rel="alternate" type="application/x-wiki" title="Redigér denne side" href="<TMPL_VAR EDITURL>" />