diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-06 17:34:30 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-06 17:34:30 -0400 |
| commit | 17fdb8028bfb2722c120b229c2131598affbddd6 (patch) | |
| tree | 51eb112f9a073559b699bc7abdb03c7eaf748cce /templates/editpage.tmpl | |
| parent | abf9f16f09da1b494856a1803f848ed51f10fdb8 (diff) | |
| parent | 6e2dc2b1fd690f36365d7d0bdd18d220b0aaa524 (diff) | |
Merge branch 'master' into tova
Diffstat (limited to 'templates/editpage.tmpl')
| -rw-r--r-- | templates/editpage.tmpl | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index f8eda1b47..7f6c2a97a 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,3 +1,4 @@ +<br /> <TMPL_VAR JAVASCRIPT> <TMPL_IF NAME="PAGE_CONFLICT"> <p> |