https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9573
Katrin Fischer <katrin.fisc...@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply --- Comment #35 from Katrin Fischer <katrin.fisc...@bsz-bw.de> --- Patches no longer apply, can you please rebase? Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 9573: Lost items report - Add items.notforloan as a filter Applying: Bug 9573: Lost items report - Move filters code to a separate js file Applying: Bug 9573: Lost items report - add KohaTable to itemlost fatal: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 9573: Lost items report - add KohaTable to itemlost The copy of the patch that failed is found in: /home/vagrant/kohaclone/.git/rebase-apply/patch 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". Patch left in /tmp/Bug-9573-Lost-items-report---add-KohaTable-to-item-M_2w8X.patc -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list Koha-bugs@lists.koha-community.org 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/