http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=11701
Dobrica Pavlinusic <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Patch doesn't apply CC| |[email protected] --- Comment #6 from Dobrica Pavlinusic <[email protected]> --- I get merge conflict when trying to apply this patch: Applying: Bug 11701: Unit tests for C4::Context::Zconn Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging t/Context.t CONFLICT (content): Merge conflict in t/Context.t Failed to merge in the changes. Patch failed at 0001 Bug 11701: Unit tests for C4::Context::Zconn Would you rebase it on top of master please? -- 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/
