Merge branch 'sematic-version' of https://github.com/OSIPI/osipi into…

… sematic-version
OSIPI · Aug 29, 2024 · dec3569 · dec3569
2 parents 375b1ab + bcd0dd8
commit dec3569
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -10,6 +10,7 @@ requires-python = ">=3.6"
 [[project.authors]]
 name = "Luis Torres"
 email = "luistorres@flywheel.io"
+<<<<<<< HEAD
 
 [[project.authors]]
 name = "Steven Sourbron"
@@ -18,6 +19,16 @@ email = "s.sourbron@sheffield.ac.uk"
 [project.license]
 file = "LICENSE"
 
+=======
+
+[[project.authors]]
+name = "Steven Sourbron"
+email = "s.sourbron@sheffield.ac.uk"
+
+[project.license]
+file = "LICENSE"
+
+>>>>>>> bcd0dd872bbc4c6ec6a97e583e212d065045a274
 [project.urls]
 Homepage = "https://osipi.github.io/pypi"