From 5cb56956793bfa20533b11155587bae025e21f8a Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Thu, 12 Dec 2024 16:32:58 -0500
Subject: [PATCH] resolve conflict

---
 pyproject.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index be0216c0..1e518a5a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -62,12 +62,8 @@ lint = [
     "qiskit-addon-cutting[style]",
     "mypy==1.11.2",
     "reno>=3.4.0",
-<<<<<<< HEAD
     "pylint==3.2.7",
-=======
-    "pylint==3.3.1",
     "numpy<2.2",
->>>>>>> d44ca0a (Pin numpy<2.2 in lint workflow (#722))
 ]
 docs = [
     "Sphinx>=3.0.0",