remove unused exception

kayak · Feb 26, 2024 · 1761de8 · 1761de8
1 parent 9480180
commit 1761de8
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/pypika/utils.py b/pypika/utils.py
@@ -36,18 +36,7 @@ class FunctionException(Exception):
     pass
 
 
-<<<<<<< HEAD
-C = TypeVar("C")
-
-
-def builder(func: C) -> C:
-=======
-class MixedInsertStyleError(QueryException):
-    pass
-
-
 def builder(func: Callable) -> Callable:
->>>>>>> 25aabb6 (simple insert_dict() builder)
     """
     Decorator for wrapper "builder" functions.  These are functions on the Query class or other classes used for
     building queries which mutate the query and return self.  To make the build functions immutable, this decorator is