http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8484
[email protected] changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #13 from [email protected] --- Something went wrong ! Applying: Bug 8484 - Add ability to choose of lost items are removed from a borrowers record. Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging installer/data/mysql/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.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/admin/preferences/circulation.pref Failed to merge in the changes. Patch failed at 0001 Bug 8484 - Add ability to choose of lost items are removed from a borrowers record. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 8484 - Add ability to choose if lost items are removed from a borrowers record. [SIGNED-OFF] Bug 8484 - Add ability to choose of lost items are removed from a borrowers record. Apply? [yn] Patch left in /tmp/SIGNED-OFF-Bug-8484---Add-ability-to-choose-of-los-Xm4uAj.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/
