revert: correct merge conflicts

EepyElvyra · i0bs · commit fd5079604cfd · 2022-02-25T13:14:30.000-05:00
diff --git a/interactions/api/models/flags.py b/interactions/api/models/flags.py
@@ -121,9 +121,15 @@ class AppFlags(IntFlag):
     GATEWAY_MESSAGE_CONTENT_LIMITED = 1 << 19
 
 
+<<<<<<< HEAD
 class StatusType(str, Enum):
     """
     An enumerable object representing Discord status icons that a user may have.
+=======
+class StatusType(StrEnum):
+    """
+    A string enum representing Discord status icons that a user may have.
+>>>>>>> e1320ac (feat: Add localisation enum (#522))
     """
 
     ONLINE = "online"
diff --git a/interactions/enums.py b/interactions/enums.py
@@ -1,4 +1,4 @@
-from enum import Enum, IntEnum
+from enum import IntEnum, StrEnum
 
 
 class ApplicationCommandType(IntEnum):

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from enum import Enum, IntEnum`
	`1`	`+from enum import IntEnum, StrEnum`
`2`	`2`
`3`	`3`
`4`	`4`	`class ApplicationCommandType(IntEnum):`