fix

intel-analytics · Dec 2, 2024 · 488633d · 488633d
1 parent 5a284a6
commit 488633d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/python/llm/src/ipex_llm/transformers/npu_models/convert.py b/python/llm/src/ipex_llm/transformers/npu_models/convert.py
@@ -19,15 +19,11 @@
 import torch
 import importlib
 from ipex_llm.transformers.npu_models.linear import QuantizedLinear
-<<<<<<< HEAD
-import tempfile
 import time
 from typing import Callable, List, Optional
 from transformers import GenerationConfig, \
     LogitsProcessorList, StoppingCriteriaList
-=======
 from ipex_llm.transformers.utils import module_name_process
->>>>>>> f2eea036b1 (init commit)
 
 
 def module_optimization(func) -> torch.nn.Module: