mirror of
https://github.com/odoo/runbot.git
synced 2025-03-16 16:05:42 +07:00
8c11db21a2
Apparently 2.34: * flipped around the "auto-merging" and "CONFLICT" messages on stdout, so just match the second one with wildcards around to ignore the location of the first * changed the casing and content of everything after the `error` line on stderr, so just ignore it all (none of it's actually useful anyway) |
||
|---|---|---|
| .. | ||
| changelog | ||
| data | ||
| migrations/13.0.1.1 | ||
| models | ||
| tests | ||
| __init__.py | ||
| __manifest__.py | ||
| controllers.py | ||