[18.0] [MIG] partner_contact_birthplace: Migration to 18.0
Migration from 17.0 to 18.0
Issue: https://github.com/OCA/partner-contact/issues/1856
/ocabot migration partner_contact_birthplace
There hasn't been any activity on this pull request in the past 4 months, so it has been marked as stale and it will be closed automatically if no further activity occurs in the next 30 days. If you want this PR to never become stale, please ask a PSC member to apply the "no stale" label.
@pedrobaeza can reopen PR?
superseded by https://github.com/OCA/partner-contact/pull/2098
/ocabot merge nobump
@NL66278 The merge process could not start, because command `git merge --no-ff -m 'Merge PR #1903 into 18.0
Signed-off-by NL66278' tmp-pr-1903` failed with output:
Auto-merging partner_contact_birthplace/README.rst
CONFLICT (add/add): Merge conflict in partner_contact_birthplace/README.rst
Auto-merging partner_contact_birthplace/__manifest__.py
CONFLICT (add/add): Merge conflict in partner_contact_birthplace/__manifest__.py
Auto-merging partner_contact_birthplace/i18n/partner_contact_birthplace.pot
CONFLICT (add/add): Merge conflict in partner_contact_birthplace/i18n/partner_contact_birthplace.pot
Auto-merging partner_contact_birthplace/models/res_partner.py
CONFLICT (add/add): Merge conflict in partner_contact_birthplace/models/res_partner.py
Auto-merging partner_contact_birthplace/readme/USAGE.md
CONFLICT (add/add): Merge conflict in partner_contact_birthplace/readme/USAGE.md
Auto-merging partner_contact_birthplace/static/description/index.html
CONFLICT (add/add): Merge conflict in partner_contact_birthplace/static/description/index.html
Auto-merging partner_contact_birthplace/views/res_partner.xml
CONFLICT (add/add): Merge conflict in partner_contact_birthplace/views/res_partner.xml
Automatic merge failed; fix conflicts and then commit the result.
/ocabot rebase
Congratulations, PR rebased to 18.0.