fix conflicts

This commit is contained in:
iDutchy
2020-12-04 19:05:58 -06:00
22 changed files with 564 additions and 157 deletions

View File

@@ -34,7 +34,7 @@ from . import utils
from .user import BaseUser, User
from .activity import create_activity
from .permissions import Permissions
from .enums import Status, try_enum, UserFlags, HypeSquadHouse
from .enums import Status, try_enum
from .colour import Colour
from .object import Object