Initial review in upgrading templates to 2.2

diff --git a/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl b/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl
index 9b55ec6..6f62373 100644 (file)
--- a/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/npl/en/reports/reports-home.tmpl
@@ -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" -->