resolve merge conflicts

.gitea/workflows/ci.yml

@@ -53,9 +53,11 @@ jobs:
           ref: "${{ inputs.BEC_PLUGIN_REPO_BRANCH || github.head_ref || github.sha }}"
           path: ./csaxs_bec
 
-      - name: Lint for merge conflicts
+      - name: Lint for merge conflicts from template updates
+        shell: bash
         run: |
-          
+          ! grep -r  "<<<<<<< before updating" ./
+          ! grep -r  "<<<<<<< after updating" ./
 
       - name: Checkout BEC Core
         run: git clone --depth 1 --branch "${{ inputs.BEC_CORE_BRANCH || 'main' }}" https://github.com/bec-project/bec.git ./bec

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",