fix merge

Signed-off-by: Kyle Sayers <kylesayrs@gmail.com>
vllm-project · Jan 29, 2025 · 5070615 · 5070615
1 parent 2d6e366
commit 5070615
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/src/llmcompressor/modifiers/utils/hooks.py b/src/llmcompressor/modifiers/utils/hooks.py
@@ -29,17 +29,12 @@ class HooksMixin(BaseModel):
         - modifier.remove_hooks()
     """
 
-<<<<<<< .merge_file_6kKUs9
     # attached to global HooksMixin class
     _HOOKS_DISABLED: ClassVar[bool] = False
     _HOOKS_KEEP_ENABLED: ClassVar[Set[RemovableHandle]] = set()
 
     # attached to local subclasses
     _hooks: Set[RemovableHandle] = set()
-=======
-    _HOOKS_DISABLED: ClassVar[bool] = False  # attached to global HooksMixin
-    _hooks: Set[RemovableHandle] = set()  # attached to local subclasses
->>>>>>> .merge_file_ehHxqS
 
     @classmethod
     @contextlib.contextmanager