From 339605f94250325e7b69d1318a380f370ced1cd4 Mon Sep 17 00:00:00 2001
From: Ella Charlaix <ella@huggingface.co>
Date: Mon, 6 Nov 2023 12:16:03 +0100
Subject: [PATCH] fix conflits

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 49fcef2408..ca47ac1ad7 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,6 @@
     assert False, "Error: Could not open '%s' due %s\n" % (filepath, error)
 
 INSTALL_REQUIRE = [
-<<<<<<< HEAD
     "optimum @ git+https://github.com/huggingface/optimum.git",
     "transformers>=4.20.0",
     "datasets>=1.4.0",