git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bumped release for roll live.
[cocanwiki.git]
/
templates
/
edit_conflict.html
diff --git
a/templates/edit_conflict.html
b/templates/edit_conflict.html
index
234c347
..
d176c57
100644
(file)
--- a/
templates/edit_conflict.html
+++ b/
templates/edit_conflict.html
@@
-44,7
+44,8
@@
to an <strong>edit conflict</strong> which you have to fix by hand.
<hr/>
<ul id="footer" class="menu">
<hr/>
<ul id="footer" class="menu">
-<li> <a href="/copyright">Copyright © 2004</a> </li>
+<li class="first"> <a href="/copyright">Copyright © ::year::</a> </li>
+<li> Powered by <a href="http://sandbox.merjis.com/">::cocanwiki_package_html:: ::cocanwiki_version_html::</a> </li>
</ul>
</body>
</ul>
</body>