http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8597
Paul Poulain <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Passed QA |Failed QA --- Comment #40 from Paul Poulain <[email protected]> --- I still can't apply patch #6 Bug 8597: Add system preferences to configure the mobile view. Apply? [yn] y Applying: Bug 8597: Add system preferences to configure the mobile view. fatal: sha1 information is lacking or useless (koha-tmpl/opac-tmpl/ccsr/en/css/opac.css). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 8597: Add system preferences to configure the mobile view. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Patch left in /tmp/Bug-8597-Add-system-preferences-to-configure-the-m-IzlCyk.patch (Also note that there is a trivial conflict on patch #1) -- 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/
