https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=34611
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Patch doesn't apply --- Comment #28 from Katrin Fischer <[email protected]> --- This also needs a rebase, conflict in Statistics.pm - I think it will be better if you resolve yourself. Also goes on my list to be pushed once it's bounced back. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 34611: Unit tests Applying: Bug 34611: Add pseudonymize routine to Koha::Statistics Using index info to reconstruct a base tree... M Koha/Statistic.pm Falling back to patching base and 3-way merge... Auto-merging Koha/Statistic.pm CONFLICT (content): Merge conflict in Koha/Statistic.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 34611: Add pseudonymize routine to Koha::Statistics hint: Use 'git am --show-current-patch=diff' to see the failed patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-34611-Add-pseudonymize-routine-to-KohaStatisti-tmb2y2g5.patch -- 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/
