https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=14367
Hugo Agud <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #14 from Hugo Agud <[email protected]> --- 56613 - Bug 14367: Add MARC record history 64243 - Bug 14367: [FOLLOW-UP] Fixing merge conflicts... Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 14367: Add MARC record history 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 <stdin>:376: new blank line at EOF. + 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 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 Failed to merge in the changes. Patch failed at 0001 Bug 14367: Add MARC record history The copy of the patch that failed is found in: /home/vagrant/kohaclone/.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-14367-Add-MARC-record-history-6jWpQA.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/
