[Koha-bugs] [Bug 11413] Marc modification template has not the expected behavior if the condition and source fields are on the same field

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11413 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 #14 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- Some problems occurred applying patches from bug 11413: <h1>Something went wrong !</h1>Applying: Bug 11413: Change the field number logic Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/MarcModificationTemplates.pm CONFLICT (content): Merge conflict in C4/MarcModificationTemplates.pm Auto-merging Koha/SimpleMARC.pm CONFLICT (content): Merge conflict in Koha/SimpleMARC.pm Auto-merging t/SimpleMARC.t CONFLICT (content): Merge conflict in t/SimpleMARC.t Failed to merge in the changes. Patch failed at 0001 Bug 11413: Change the field number logic When you have resolved this problem run git bz apply --continue. -- You are receiving this mail because: You are watching all bug changes.