http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11213
--- Comment #61 from Marcel de Rooy <[email protected]> --- Repeated on fresh master: Applying: bug_11213: C4::VirtualShelves::Page::shelf_contents() fatal: sha1 information is lacking or useless (C4/VirtualShelves/Page.pm). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 bug_11213: C4::VirtualShelves::Page::shelf_contents() Since our git version may be different, please apply them again with your git version and resubmit. -- 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/
