diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 22:39:07 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-20 22:39:07 +0200 |
| commit | 306eb61d606fd1ab40ef74866a14267384e0b2d6 (patch) | |
| tree | 690e60780f78ff3cc744968d1f6924d491465055 | |
| parent | ea16b1e537ffb534d11c7d7dac262259fd03f601 (diff) | |
| parent | 3e2f923e92cf5757631a0ed28223a68d38e71f6f (diff) | |
Merge branch 'scs' into scs-da
Conflicts (manually resolved):
page.tmpl
| -rw-r--r-- | page.tmpl | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -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>" /> |