http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5342 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |koha@univ-lyon3.fr --- Comment #63 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- <h1>Something went wrong !</h1>Applying: Bug 5342: Adds a claims_count field in the serial table Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Serials.pm CONFLICT (content): Merge conflict in C4/Serials.pm 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/serials/claims.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt Auto-merging serials/claims.pl CONFLICT (content): Merge conflict in serials/claims.pl Failed to merge in the changes. -- You are receiving this mail because: You are watching all bug changes.