[Koha-bugs] [Bug 29648] Make KohaTable tables 'default length' and 'default sort' configurable

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=29648

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #118 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
(In reply to Jonathan Druart from comment #117)
> QA please? This is a nightmare to rebase!

Sorry to be late :(

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 29648: Improve existing code
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/columns_settings.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 29648: Improve existing code

Could you please rebase? I'll try to get back to this ASAP after.

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