Commit aff67d6c authored by Nigel McNie's avatar Nigel McNie Committed by Nigel McNie
Browse files

Removed conflict markers.

parent 9d465c97
{include file='header.tpl'}
<<<<<<< master
<h2>{str tag="administration"}</h2>
=======
<div class="content">
<div class="box-cnrs"><span class="cnr-tl"><span class="cnr-tr"><span
class="cnr-bl"><span class="cnr-br">
......@@ -10,16 +9,12 @@ class="cnr-bl"><span class="cnr-br">
<h2>Administration</h2>
<p>Screens here:</p>
>>>>>>> origin
<ul>
<<<<<<< master
<li><strong><a href="options/">{str tag="adminsiteoptions" section="admin"}</a></strong><br>
{str tag="adminsiteoptionsdescription" section="admin"}</li>
<li>AdminSiteEditor - ???</li>
=======
<li><a href="options/">Site Options</a></li>
>>>>>>> origin
<li><a href="institutions.php">Institutions</a></li>
<li><a href="editsitepage.php">Site Pages</a></li>
<li><a href="editmenu.php">Site Menu</a></li>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment