http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11213 --- Comment #60 from Srdjan Jankovic <srdjan@catalyst.net.nz> --- (In reply to Marcel de Rooy from comment #59)
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.
Not sure why. Applying: bug_11213: C4::VirtualShelves::Page::shelf_contents() Using index info to reconstruct a base tree... M C4/VirtualShelves/Page.pm Falling back to patching base and 3-way merge... Auto-merging C4/VirtualShelves/Page.pm etc Can you please give it another go? -- You are receiving this mail because: You are watching all bug changes.