http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5342
jmbroust <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |jean-manuel.broust@univ-lyo | |n2.fr --- Comment #5 from jmbroust <[email protected]> --- tested on sandbox 1 Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 5342: Followup: Delete all occurrences of preview When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". -- You are receiving this mail because: You are the QA Contact for the bug. 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/
