http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5337
jmbroust <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |jean-manuel.broust@univ-lyo | |n2.fr --- Comment #15 from jmbroust <[email protected]> --- Applying: Bug 5337: EAN management : Adds ean for various searches Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Acquisition.pm Auto-merging C4/Biblio.pm Auto-merging C4/Serials.pm Auto-merging acqui/addorder.pl Auto-merging acqui/histsearch.pl Auto-merging acqui/neworderempty.pl Auto-merging acqui/parcel.pl CONFLICT (content): Merge conflict in acqui/parcel.pl Auto-merging catalogue/detail.pl Auto-merging installer/data/mysql/en/marcflavour/unimarc/mandatory/unimarc_framework_DEFAULT.sql Auto-merging installer/data/mysql/kohastructure.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt Auto-merging kohaversion.pl CONFLICT (content): Merge conflict in kohaversion.pl Auto-merging opac/opac-ISBDdetail.pl Auto-merging opac/opac-detail.pl Auto-merging serials/routing-preview.pl Auto-merging serials/routing.pl Auto-merging serials/serials-collection.pl Auto-merging serials/serials-edit.pl Auto-merging serials/subscription-detail.pl Failed to merge in the changes. -- You are receiving this mail because: You are the QA Contact for the bug. 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/
