Merge error

buildingSMART · Jan 23, 2025 · 8f8c8a5 · 8f8c8a5
1 parent 27b96b9
commit 8f8c8a5
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/features/steps/utils/geometry.py b/features/steps/utils/geometry.py
@@ -1,11 +1,7 @@
 from dataclasses import dataclass
 import operator
 import math
-<<<<<<< HEAD
-from typing import Dict, Optional
-=======
-from typing import Dict, Tuple
->>>>>>> development
+from typing import Dict, Optional, Tuple
 
 import numpy as np
 import mpmath as mp