fix pyproject.toml

ajtmccarty · ajtmccarty · commit 5a525f40d9a1 · 2025-05-05T09:45:01.000-07:00
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,10 +1,6 @@
 [tool.poetry]
 name = "infrahub-server"
-<<<<<<< HEAD
 version = "1.3.0a0"
-=======
-version = "1.2.9rc0"
->>>>>>> stable
 description = "Infrahub is taking a new approach to Infrastructure Management by providing a new generation of datastore to organize and control all the data that defines how an infrastructure should run."
 authors = ["OpsMill <info@opsmill.com>"]
 readme = "README.md"
