http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11169
jmbroust <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |jean-manuel.broust@univ-lyo | |n2.fr --- Comment #11 from jmbroust <[email protected]> --- <h1>Something went wrong !</h1>Applying: Bug 11169: Display acquition details at the OPAC Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging C4/Acquisition.pm CONFLICT (content): Merge conflict in C4/Acquisition.pm Auto-merging installer/data/mysql/sysprefs.sql Auto-merging installer/data/mysql/updatedatabase.pl CONFLICT (content): Merge conflict in installer/data/mysql/updatedatabase.pl Failed to merge in the changes. Patch failed at 0001 Bug 11169: Display acquition details at the OPAC When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 11169 - OPAC: Display an acquisition details tab 26082 - Bug 11169: Display acquition details at the OPAC 26083 - Bug 11169: [Bootstrap] Display acquition details at the OPAC 26084 - Bug 11169: Hide the date_due column -- 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/
