https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6934
Héctor Eduardo Castro Avalos <hector.hecax...@gmail.com> changed:
What |Removed |Added
----------------------------------------------------------------------------
Status|Needs Signoff |In Discussion
--- Comment #63 from Héctor Eduardo Castro Avalos <hector.hecax...@gmail.com>
---
Hi Bouzid
For me the patch fails in master when apply
>Applying: Bug 6934 New report Cash Register Statistics
>Using index info to reconstruct a base tree...
>Falling back to patching base and 3-way merge...
>Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>CONFLICT (content): Merge conflict in
>koha-tmpl/intranet-tmpl/prog/en/modules/reports/reports-home.tt
>Failed to merge in the changes.
>Patch failed at 0001 Bug 6934 New report Cash Register Statistics
Do I need to apply all patches or just few of them?
Regards
--
You are receiving this mail because:
You are watching all bug changes.
You are the QA Contact for the bug.
_______________________________________________
Koha-bugs mailing list
Koha-bugs@lists.koha-community.org
http://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/
