asasdasd

code-specialist · Nov 16, 2022 · f2a95f0 · f2a95f0
1 parent 85ad1ab
commit f2a95f0
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,18 +1,10 @@
 [tool.poetry]
-<<<<<<< HEAD
 name = "code-specialist-example-package"
 version = "1.0.0"
 description = "Test package"
 authors = ["Yannic Schröer"]
 packages = [{include = "example_package"}]
-=======
-name = "testing-github-action"
-version = "1.0.2"
-description = ""
-authors = ["Your Name <you@example.com>"]
-readme = "README.md"
-packages = [{include = "testing_github_action"}]
->>>>>>> c5a5de06cdb4d5b773a39461813138e9ea21f9ce
+
 
 [tool.poetry.dependencies]
 python = "^3.10"