@@ -, +, @@
---
.../intranet-tmpl/prog/en/modules/reports/reports-home.tt | 14 ++++++++++++++
tools/access_files.pl | 8 +++-----
2 files changed, 17 insertions(+), 5 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
@@ -60,6 +60,7 @@
Items with no checkouts
+<<<<<<< HEAD
Other
+=======
+ Other
+
+>>>>>>> Bug 11317 - Update the link under reports
--- a/tools/access_files.pl
+++ a/tools/access_files.pl
@@ -20,9 +20,7 @@
# You should have received a copy of the GNU General Public License along
# with Koha; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-use strict;
-use warnings;
+use Modern::Perl;
use C4::Auth;
use CGI;
@@ -41,8 +39,8 @@ my ($template, $borrowernumber, $cookie)
= get_template_and_user({template_name => "tools/access_files.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
- flagsrequired => { tools => 'access_files' },
+ authnotrequired => 0,
+ flagsrequired => { tools => 'access_files' },
});
unless(@directories) {
--