http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12988
Paola Rossi <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply --- Comment #13 from Paola Rossi <[email protected]> --- Thanks, Jonathan. I've tried to apply against master 3.17.00.025 Now I've applied: 12844 (4), 12986, 12987 (2), 12955, 12988. The patches 12984 and 12989 remain yet to be applied. Applying: Bug 12984: Improvement of the funds list view - acqui home 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/acqui-home.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt Failed to merge in the changes. Patch failed at 0001 Bug 12984: Improvement of the funds list view - acqui home So I pass again the patch to "Patch doesn't apply" status. [I beg your pardon if this is not the right bug to be passed] -- 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/
