From c07ed08fd4dc815c6a28e8c69fd48d6c83213b96 Mon Sep 17 00:00:00 2001
From: Daniel Sollien <daniel.sollien@gmail.com>
Date: Mon, 27 Nov 2023 11:10:38 +0100
Subject: [PATCH] Remove forgotten remnant of conflict

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

diff --git a/pyproject.toml b/pyproject.toml
index 8d066df0..f485e542 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -32,11 +32,7 @@ dev = ["pytest", "black", "flake8"]
 # package-dir = { "" = "src" }
 # include-package-data = true
 # platforms = ["any"]
-<<<<<<< HEAD
 #
-=======
-
->>>>>>> 0cc9c1c (Comment out tool setuptools)
 # [tool.setuptools.packages.find]
 # where = ["src"]