https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=25067
Katrin Fischer <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #54 from Katrin Fischer <[email protected]> --- Hm, having problems applying this patch set: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 25067: Move PO file manipulation code into gulp tasks Using index info to reconstruct a base tree... M gulpfile.js M package.json M t/LangInstaller.t M yarn.lock Falling back to patching base and 3-way merge... Auto-merging yarn.lock CONFLICT (content): Merge conflict in yarn.lock Auto-merging t/misc/translator/sample.tt CONFLICT (modify/delete): t/LangInstaller.t deleted in Bug 25067: Move PO file manipulation code into gulp tasks and modified in HEAD. Version HEAD of t/LangInstaller.t left in tree. Auto-merging package.json CONFLICT (content): Merge conflict in package.json Auto-merging gulpfile.js error: Failed to merge in the changes. Patch failed at 0001 Bug 25067: Move PO file manipulation code into gulp tasks 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-25067-Move-PO-file-manipulation-code-into-gulp-ejV37B.patch Can you please check? -- 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/
