fix merge conflict

itt-ustutt · Dec 17, 2024 · 809add4 · 809add4
1 parent 39d112d
commit 809add4
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/si-units/pyproject.toml b/si-units/pyproject.toml
@@ -5,16 +5,9 @@ description = "Representation of quantites, i.e. of unit valued scalars and arra
 readme = "README.md"
 authors = [
     { name = "Philipp Rehner", email = "[email protected]" },
-<<<<<<< Updated upstream
     { name = "Gernot Bauer", email = "[email protected]" },
 ]
 requires-python = ">=3.9"
-=======
-    { name = "Gernot Bauer", email = "[email protected]" }
-]
-requires-python = ">=3.9"
-dependencies = []
->>>>>>> Stashed changes
 
 [tool.maturin]
 module-name = "si_units._core"