resolve conflict

jtsodapop · jtsodapop · commit af086868d442 · 2022-01-28T16:32:36.000-05:00
diff --git a/labelbox/data/annotation_types/geometry/mask.py b/labelbox/data/annotation_types/geometry/mask.py
@@ -1,4 +1,4 @@
-from typing import Callable, Optional, Tuple, Union, Dict
+from typing import Callable, Optional, Tuple, Union, List
 
 import numpy as np
 from pydantic.class_validators import validator

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from typing import Callable, Optional, Tuple, Union, Dict`
	`1`	`+from typing import Callable, Optional, Tuple, Union, List`
`2`	`2`
`3`	`3`	`import numpy as np`
`4`	`4`	`from pydantic.class_validators import validator`