mirror of
https://github.com/OCA/OCB.git
synced 2026-04-23 19:14:53 -06:00
This page contains links to extra pages describing how conflicts resulting from merges by the @OCA-git-bot (done every night automatically and committed into github.com:OCA/OCB if no conflicts occurred) were resolved manually. Is is structured by branch and day, so expect to find page names in the form $branch-yyyy-mm-dd.
Note that non-trivial conflict resolutions will be offered as a pull request and linked here, too.
Until all links are fixed, add "OLD-" before each URL