https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11529
Michal Denar <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #144 from Michal Denar <[email protected]> --- Hi Ere, I get error: Applying: Bgu 11529: Update kohafield in default framework only if not already set. Using index info to reconstruct a base tree... A installer/data/mysql/atomicupdate/bug_11529.perl Falling back to patching base and 3-way merge... CONFLICT (modify/delete): installer/data/mysql/atomicupdate/bug_11529.perl deleted in HEAD and modified in Bgu 11529: Update kohafield in default framework only if not already set.. Version Bgu 11529: Update kohafield in default framework only if not already set. of installer/data/mysql/atomicupdate/bug_11529.perl left in tree. error: Failed to merge in the changes. Please, can you rebase? -- 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/
