https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14367 Hammat wele <hammat.wele@inlibro.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |hammat.wele@inlibro.com --- Comment #68 from Hammat wele <hammat.wele@inlibro.com> --- Applying: Bug 14367: Add MARC record history .git/rebase-apply/patch:393: trailing whitespace. warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M C4/Biblio.pm M cataloguing/addbiblio.pl M koha-tmpl/intranet-tmpl/prog/css/addbiblio.css M koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt M koha-tmpl/intranet-tmpl/prog/js/cataloging.js .git/rebase-apply/patch:393: trailing whitespace. warning: 1 line adds whitespace errors. Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/cataloging.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt Auto-merging koha-tmpl/intranet-tmpl/prog/css/addbiblio.css CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/css/addbiblio.css Auto-merging cataloguing/addbiblio.pl CONFLICT (content): Merge conflict in cataloguing/addbiblio.pl Auto-merging C4/Biblio.pm CONFLICT (content): Merge conflict in C4/Biblio.pm error: Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.