[Koha-bugs] [Bug 14746] Set up logging and configuration file reading for Mojolicious
bugzilla-daemon at bugs.koha-community.org
bugzilla-daemon at bugs.koha-community.org
Sun Oct 8 11:24:33 CEST 2017
https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14746
Katrin Fischer <katrin.fischer at bsz-bw.de> changed:
What |Removed |Added
----------------------------------------------------------------------------
CC| |katrin.fischer at bsz-bw.de
Status|Needs Signoff |Patch doesn't apply
--- Comment #3 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
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.
More information about the Koha-bugs
mailing list