[Koha-bugs] [Bug 7679] Statistics wizard: circulation (new filters)

[bugzilla-daemon at bugs.koha-community.org]

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7679

--- Comment #44 from M. Tompsett <mtompset at hotmail.com> ---
(In reply to Chris Cormack from comment #43)
> Falling back to patching base and 3-way merge...
> Auto-merging reports/issues_stats.pl
> CONFLICT (content): Merge conflict in reports/issues_stats.pl
> Failed to merge in the changes.
> 
> 
> Not a simple conflict

Most of it seemed to be whitespace indentation issues.
I'll upload a fix, and then do a comparison to make sure nothing seems lost.

-- 
You are receiving this mail because:
You are watching all bug changes.