1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
4 <title>Edit conflict</title>
5 <meta name="author" content="http://www.merjis.com/" />
6 <link rel="stylesheet" href="/_css/standard.css" type="text/css" title="Standard"/>
7 <link rel="stylesheet" href="/_css/editor.css" type="text/css" title="Standard"/>
8 <script src="/_js/editor.js" type="text/javascript"></script>
11 <h1><span>Edit conflict</span></h1>
14 Someone else edited that page while you were editing it. This leads
15 to an <strong>edit conflict</strong> which you have to fix by hand.
19 <li> <a target="_blank" href="/::url_html_tag::/edit">Edit the page again</a>
20 (opens in a new window so you can refer back to this page) </li>
21 <li> <a href="/::url_html_tag::">Abandon your changes</a> </li>
24 <table id="edit_conflict" width="100%">
26 <th class="other"> Other person's edits </th>
27 <th class="our"> Your edits </th>
30 <td class="other" width="50%">
35 <td class="our" width="50%">
43 ::include(footer.html)::