https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13952
Michael Kuhn <m...@adminkuhn.ch> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |m...@adminkuhn.ch --- Comment #26 from Michael Kuhn <m...@adminkuhn.ch> --- Applying: Bug 13952: Import and export authority types fatal: sha1 information is lacking or useless (admin/import_export_framework.pl). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 13952: Import and export authority types 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-13952-Import-and-export-authority-types-u9za7y.patch -- 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/