http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8130
Olugbenga Adara <gbengaad...@yahoo.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |gbengaad...@yahoo.com --- Comment #4 from Olugbenga Adara <gbengaad...@yahoo.com> --- Trying to sign off on this patch using Biblibre's sandbox. Got the message below <h1>Something went wrong !</h1>Applying: Bug 8130 - attach PDF files to a patron record<br/> Using index info to reconstruct a base tree...<br/> Falling back to patching base and 3-way merge...<br/> Auto-merging installer/data/mysql/sysprefs.sql<br/> CONFLICT (content): Merge conflict in installer/data/mysql/sysprefs.sql<br/> Auto-merging installer/data/mysql/updatedatabase.pl<br/> CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl<br/> Failed to merge in the changes.<br/> Patch failed at 0001 Bug 8130 - attach PDF files to a patron record<br/> -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/