diff options
| author | Christophe Monniez <moc@odoo.com> | 2019-11-05 14:08:38 +0000 |
|---|---|---|
| committer | fw-bot <otis@odoo.com> | 2019-11-08 13:04:59 +0000 |
| commit | 4fdb07f81bdd0e461a168d5357ef8f05d9a897cb (patch) | |
| tree | cfb25e99f47db1ab6f2f4a75d46409c2db716c8f /addons/theme_default/data/theme_default_data.xml | |
| parent | 99a034774bd3d37e0bff4f7e183462c51a298336 (diff) | |
[IMP] test_lint: add a test to detect git conflict markers
Since the deployement of the forward-port bot, chances to merge code
with conflict markers has greatly increased.
With this commit, a new test is added to grep for those markers in most
common code files.
closes odoo/odoo#40029
X-original-commit: 19bf61c0e0c0464058064565be1051e5f43516ab
Signed-off-by: Christophe Monniez (moc) <moc@odoo.com>
Diffstat (limited to 'addons/theme_default/data/theme_default_data.xml')
0 files changed, 0 insertions, 0 deletions