fix rebasing issue

huggingface · Nov 5, 2024 · 00f22b9 · 00f22b9
1 parent 71a0bb8
commit 00f22b9
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/optimum/exporters/openvino/model_patcher.py b/optimum/exporters/openvino/model_patcher.py
@@ -2765,7 +2765,6 @@ def __exit__(self, exc_type, exc_value, traceback):
             self._model.pos_embed.forward = self._model.pos_embed._orig_forward
 
 
-<<<<<<< HEAD
 def _minicpmv_resampler_forward(self, image_feature, pos_embed, key_padding_mask):
     bs = image_feature.shape[0]
     image_feature = self.kv_proj(image_feature)  # B * L * D