resolve merge conflicts

2026-02-27 12:21:01 +01:00
parent d6686bbd0e
commit c8bf5153d4
1 changed files with 0 additions and 5 deletions
--- 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",