Contributors mailing list archives
contributors@odoo-community.org
Browse archives
Re: No upstream merges in OCB in April
by
        
            Tecnativa. S. L., Pedro M. Baeza
        
        
        
    
        
        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
- 
                No upstream merges in OCB in AprilbyQuartile Corporation, Yoshi Tashiro.- 10/04/2025 15:20:35 - 0- 
                
- 
                Re: No upstream merges in OCB in AprilbyTecnativa. S. L., Pedro M. Baeza- 04/08/2025 17:35:06 - 0
- 
                
- 
                Re: No upstream merges in OCB in AprilbyQuartile Corporation, Yoshi Tashiro.- 11/04/2025 10:47:17 - 0
- 
                Re: No upstream merges in OCB in AprilbyTecnativa. S. L., Pedro M. Baeza- 11/04/2025 09:03:04 - 0
 
-