From c8bf5153d4fceb3aeb2a00e4cf87b590fa439676 Mon Sep 17 00:00:00 2001
From: perl_d <david.perl@psi.ch>
Date: Fri, 27 Feb 2026 12:21:01 +0100
Subject: [PATCH] resolve merge conflicts

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

diff --git a/pyproject.toml b/pyproject.toml
index 33be353..8c9ab9c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -5,13 +5,8 @@ build-backend = "hatchling.build"
 [project]
 name = "csaxs_bec"
 version = "0.0.0"
-<<<<<<< before updating
 description = "The cSAXS plugin repository for BEC"
-requires-python = ">=3.10"
-=======
-description = "A plugin repository for BEC"
 requires-python = ">=3.11"
->>>>>>> after updating
 classifiers = [
     "Development Status :: 3 - Alpha",
     "Programming Language :: Python :: 3",