http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5327
--- Comment #68 from Paul Poulain <[email protected]> 2011-12-15 12:55:27 UTC --- QA comments: 2 tests not merged: ==== TEST 1 ==== [SIGNED-OFF] Added coverage to unit test for TTParser I don't understand what this patch is adding. A little bit more explanatory on the commit notes welcomed... ==== TEST 2 ==== Applying: Moving SIP_ILS.t to db_dependent fatal: sha1 information is lacking or useless (t/SIP_ILS.t). Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Moving SIP_ILS.t to db_dependent When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". -- Configure bugmail: http://bugs.koha-community.org/bugzilla3/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the QA Contact for the bug. 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/
