git.annexia.org
/
cocanwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Commented a bug.
[cocanwiki.git]
/
templates
/
edit_conflict.html
diff --git
a/templates/edit_conflict.html
b/templates/edit_conflict.html
index
b782e7d
..
8cc3073
100644
(file)
--- a/
templates/edit_conflict.html
+++ b/
templates/edit_conflict.html
@@
-8,7
+8,7
@@
<script src="/_js/editor.js" type="text/javascript"></script>
</head><body>
-<h1>
Edit conflict
</h1>
+<h1>
<span>Edit conflict</span>
</h1>
<p>
Someone else edited that page while you were editing it. This leads