https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=8179
--- Comment #30 from Agustín Moyano <[email protected]> --- (In reply to Séverine Queune from comment #25) > Apply? [(y)es, (n)o, (i)nteractive] y > Applying: Bug 8179: Add tests > Applying: Bug 8179: Add syspref to database > Applying: Bug 8179: Add AcqReceiveMultipleOrderLines syspref to preference > configuration > Applying: Bug 8179: Receive multiple orders > Using index info to reconstruct a base tree... > M koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt > Falling back to patching base and 3-way merge... > Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt > CONFLICT (content): Merge conflict in > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt > Failed to merge in the changes. Hello Séverine, could you please try once more? -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://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/
