http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7919
Alexandre Lengereau <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |alexandre.lengereau@biblibr | |e.com --- Comment #18 from Alexandre Lengereau <[email protected]> --- Sandbox test result: Something went wrong ! Applying: Bug 7919 : Display of values depending on the connexion librairy Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Budgets.pm Auto-merging C4/Input.pm Auto-merging C4/Koha.pm Auto-merging C4/Members.pm Auto-merging C4/Members/AttributeTypes.pm Auto-merging C4/Members/Attributes.pm Auto-merging admin/authorised_values.pl Auto-merging admin/categorie.pl CONFLICT (content): Merge conflict in admin/categorie.pl Auto-merging admin/patron-attr-types.pl Auto-merging cataloguing/addbiblio.pl Auto-merging cataloguing/additem.pl 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/admin/authorised_values.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt Failed to merge in the changes. Patch failed at 0001 Bug 7919 : Display of values depending on the connexion librairy 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 7919 - Display of values depending on the connexion library Bug 7919 : Display of values depending on the connexion librairy Apply? [yn] Patch left in /tmp/Bug-7919--Display-of-values-depending-on-the-conne-hVli22.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/
