Resolved merge conflicts

Signed-off-by: CocoByte <nicolle.leclair@gmail.com>
This commit is contained in:
CocoByte 2023-10-06 02:16:59 -06:00
commit 67b9d2f69a
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F

View file

@ -12,6 +12,7 @@ class TransitionDomain(TimeStampedModel):
"""Transition Domain model stores information about the
state of a domain upon transition between registry
providers"""
StatusChoices=StatusChoices
StatusChoices = StatusChoices