http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9824
[email protected] changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #55 from [email protected] --- 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. _______________________________________________ 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/
