[Koha-bugs] [Bug 9824] Hide basket with no expected items in basket list by bookseller

bugzilla-daemon at bugs.koha-community.org bugzilla-daemon at bugs.koha-community.org
Thu May 23 10:03:21 CEST 2013


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

cedric.vita at dracenie.com changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |cedric.vita at dracenie.com

--- Comment #55 from cedric.vita at dracenie.com ---
Sandbox setup by unknown with database 2 and bug 9824 on Thu May 23 09:59:56
2013

Something went wrong !
Applying: Bug 9824: Followup for POD lines of GetBasketsInfosByBookseller
Applying: Bug 9824: Followup adding some text around Apply/cancel filter.
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/booksellers.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
Failed to merge in the changes.
Patch failed at 0001 Bug 9824: Followup adding some text around Apply/cancel
filter.
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 9824 - Hide basket with no expected items in basket list by bookseller

Bug 9824: Followup for POD lines of GetBasketsInfosByBookseller
Apply? [yn]
Bug 9824: Followup adding some text around Apply/cancel filter.
Apply? [yn]
Patch left in
/tmp/Bug-9824-Followup-adding-some-text-around-Applycan-myQQFX.patch

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


More information about the Koha-bugs mailing list