Fix the migration conflict

This commit is contained in:
Rosemary Orchard 2022-04-18 09:29:08 +01:00
parent fcb56c7628
commit 0703f04bf2