1. Mailing Lists
  2. Contributors
  3. Re: No upstream merges in OCB in April

Contributors mailing list archives

contributors@odoo-community.org

Browse archives

Re: OWL Trainers Wanted (RFQ Deadline 17th April) by the OCA and AEOdoo

No upstream merges in OCB in April

Avatar

Re: No upstream merges in OCB in April

by
Tecnativa. S. L., Pedro M. Baeza
- 11/04/2025 09:03:04
Hi, Yoshi,

There was a change upstream in README.md that conflicts with OCB, as detected by Denis in https://github.com/OCA/OCB/pull/1293#issuecomment-2796016633. I have pulled locally and fix the conflict, pushing the result, and it should return to normal synchronization.

Thanks for noticing.

Reference