Initial review in upgrading templates to 2.2

This commit is contained in:
oleonard 2004-10-25 17:18:00 +00:00
parent 0364e1fc6b
commit 2e61ca7fe8

View file

@ -4,21 +4,12 @@
<div id="main"><h3>Reports</h3>
<div class="details"><ul><li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconciliation:</a> Daily Report (yesterday)</li>
<<<<<<< reports-home.tmpl
<div class="details"><ul> <li><a href="/cgi-bin/koha/stats.pl?time=yesterday">Till Reconciliation:</a> Daily Report (yesterday)</li>
<li><a href="/cgi-bin/koha/stats.pl?time=today">Till Reconciliation:</a> Daily Report (today)</li>
<li><a href="/cgi-bin/koha/overdue.pl">Overdue items</a></li>
<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues by borrower category</a></li>
=======
<li><a href="/cgi-bin/koha/stats.pl?time=today">Till Reconciliation:</a> Daily
Report (today)</li>
<li><a href="/cgi-bin/koha/overdue.pl">Overdue items</a></li>
<li><a href="/cgi-bin/koha/reports/inventory.pl">Inventory/Stocktaking</a></li>
<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=itemtypes">Catalogue by itemtype</a></li>
<li><a href="/cgi-bin/koha/reports/manager.pl?report_name=issues_by_borrower_category">Issues by borrower category</a></li>
>>>>>>> 1.2
</ul></div></div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->