From 6d9b032f8cb222c39e0a85b46ed4dc37b7a524ea Mon Sep 17 00:00:00 2001
From: Jim Garrison <garrison@ibm.com>
Date: Thu, 24 Oct 2024 14:01:49 -0400
Subject: [PATCH] Fix conflict

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

diff --git a/pyproject.toml b/pyproject.toml
index 4d182f65..5f3c6c21 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -61,13 +61,7 @@ lint = [
     "qiskit-addon-cutting[style]",
     "mypy==1.11.2",
     "reno>=3.4.0",
-<<<<<<< HEAD
     "pylint==3.2.7",
-    # pydocstyle prefers to parse our pyproject.toml, hence the following line
-    "toml",
-=======
-    "pylint==3.3.1",
->>>>>>> 0415fc6 (Replace pydocstyle with Ruff (#692))
 ]
 docs = [
     "Sphinx>=3.0.0",