NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-17 00:15:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
963ba9e911
runbot/forwardport
History
Xavier Morel be7788be0a [FIX] forwardport: git conflict markers 
2.29 changed the formatting of conflict labels (the stuff added at the
end of the closing conflict marker):
6cceea19eb

Used to be

    >>>>>>> <commit>... <text>

now is

    >>>>>>> <commit> (<text>)

Just ignore everything after the commit hash.
2020-11-20 07:41:45 +01:00
..
data [ADD] forwardport: policy on PR form 2020-07-14 13:34:05 +02:00
migrations/13.0.1.1 [IMP] forwardport: reliability of PR reminders 2020-05-26 15:56:36 +02:00
models [IMP] forwardport: lower level of waiting for batch to be ready 2020-07-30 13:20:41 +02:00
tests [FIX] forwardport: git conflict markers 2020-11-20 07:41:45 +01:00
__init__.py [ADD] forwardbot 2019-09-05 10:00:07 +02:00
__manifest__.py [IMP] forwardport: reliability of PR reminders 2020-05-26 15:56:36 +02:00