https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35807
David Nind <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #4 from David Nind <[email protected]> --- The patches no longer apply 8-(... git bz apply 35807 Bug 35807 - Update catalog statistics report 161024 - Bug 35807: Reindent catalogue_stats.tt 161025 - Bug 35807: Update catalog statistics search form and result list 161026 - Bug 35807: Improve display of appliced filters and results contents Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35807: Reindent catalogue_stats.tt Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_stats.tt error: Failed to merge in the changes. Patch failed at 0001 Bug 35807: Reindent catalogue_stats.tt -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
