Fix: pyprojecttoml syntax

Author: lwasser

pyproject.toml

@@ -3,18 +3,6 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [project]
-<<<<<<< HEAD
-name = "pyosPackage"
-#dynamic = ["version"]
-version = "0.1.4" # uncomment this and comment the line above if you want to manually update versions
-
-
-[project.urls] # Optional
-# "Homepage" = "https://www.pyopensci.org"
-# "Bug Reports" = "https://github.com/pyopensci/pyosPackage/issues"
-# "Source" = "https://github.com/pyopensci/pyosPackage/issues"
-#"Funding" = "" # optional
-=======
 name = "pyospackage"
 description = "A package that adds numbers together"
 readme = "README.md"
@@ -34,12 +22,8 @@ classifiers = [
 ]
 
 dependencies = []
-dynamic = ["version"]
-
 
 [project.urls]
 Documentation = "https://github.com/pyopensci/pyospackage#readme"
 Issues = "https://github.com/pyopensci/pyospackage/issues"
 Source = "https://github.com/pyopensci/pyospackage"
-
->>>>>>> upstream/main