https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14746
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #3 from Katrin Fischer <[email protected]> --- Patch currently has a conflict in a file, but should not be hard to resolve. How can this be tested? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14746: Set up logging and configuration file reading for Mojolicious Using index info to reconstruct a base tree... M Koha/REST/V1.pm Falling back to patching base and 3-way merge... Auto-merging Koha/REST/V1.pm CONFLICT (content): Merge conflict in Koha/REST/V1.pm error: Failed to merge in the changes. Patch failed at 0001 Bug 14746: Set up logging and configuration file reading for Mojolicious 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-14746-Set-up-logging-and-configuration-file-re-pH4w1p.patch -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] 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/
