https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29330
--- Comment #35 from Katrin Fischer <[email protected]> --- I tried to apply on 21.11.11 for testing and there are lots of conflicts right now - might need work for the maintenance branches: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 29330: Add Koha::Email->new_from_string Using index info to reconstruct a base tree... M Koha/Email.pm M t/Koha/Email.t Falling back to patching base and 3-way merge... Auto-merging t/Koha/Email.t CONFLICT (content): Merge conflict in t/Koha/Email.t Auto-merging Koha/Email.pm CONFLICT (content): Merge conflict in Koha/Email.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 29330: Add Koha::Email->new_from_string The copy of the patch that failed is found in: .git/rebase-apply/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-29330-Add-KohaEmail-newfromstring-R_84LL.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/
