[Koha-bugs] [Bug 9806] Show more information on basketgroups lists

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Thu May 23 09:05:23 CEST 2013


http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9806

Pierre Angot <tredok.pierre at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |tredok.pierre at gmail.com

--- Comment #18 from Pierre Angot <tredok.pierre at gmail.com> ---
Test on sandbox :

Sandbox setup by tredok.pierre at gmail.com with database 2 and bug 9806 on Thu
May 23 08:44:09 2013

Something went wrong !
Applying: Bug 9806 : Add new columns to basket groups lists
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
Applying: Bug 9806 : QA Followup - use template plugin for branch names
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Bug 9806 : QA Followup - use template plugin for branch
names
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".
Bug 9806 - Show more information on basketgroups lists

[SIGNED-OFF] Bug 9806 : Add new columns to basket groups lists
Apply? [yn]
[PATCH 2] Bug 9806 : QA Followup - use template plugin for branch names
Apply? [yn]
Patch left in
/tmp/PATCH-2-Bug-9806--QA-Followup---use-template-plugi-GS6lZO.patch

-- 
You are receiving this mail because:
You are watching all bug changes.


More information about the Koha-bugs mailing list