From 093967698ca48aee1e032a4f3ea450c0addd07b9 Mon Sep 17 00:00:00 2001
From: Owen Leonard
Date: Tue, 10 Apr 2012 15:43:48 -0400
Subject: [PATCH] Bug 2780 [FOLLOW-UP] Capitalize strings consistently
Content-Type: text/plain; charset="utf-8"
Changes to the case of some hidden input values prevented
the user from being able to save a new SQL report.
Signed-off-by: Liz Rea
---
.../en/modules/reports/guided_reports_start.tt | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index ea933aa..3da010a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -118,7 +118,7 @@ canned reports and writing custom SQL reports.
Use the reports dictionary to define custom criteria to use in your reports
[% END %]
@@ -583,7 +583,11 @@ Sub report:
+<<<<<<< HEAD
+=======
+
+>>>>>>> Bug 2780 [FOLLOW-UP] Capitalize strings consistently
[% END %]
--
1.7.2.5