resolve conflicts

Signed-off-by: Tim Paine <[email protected]>

Author: timkpaine

.github/workflows/build.yaml

@@ -27,13 +27,8 @@ jobs:
 
     strategy:
       matrix:
-<<<<<<< before updating
         os: [ubuntu-latest, macos-latest]
         python-version: ['3.10']
-=======
-        os: [ubuntu-latest]
-        python-version: ["3.11"]
->>>>>>> after updating
 
     steps:
     - uses: actions/checkout@v5

pyproject.toml

@@ -8,22 +8,16 @@ authors = [{name = "Point72, L.P.", email = "[email protected]"}]
 description = "ccflow is a collection of tools for workflow configuration, orchestration, and dependency injection"
 readme = "README.md"
 license = { text = "Apache-2.0" }
-<<<<<<< before updating
 version = "0.6.10"
-requires-python = ">=3.9"
+requires-python = ">=3.10"
 keywords = [
     "configuration",
     "flow",
     "dag",
     "hydra",
     "pydantic",
 ]
-=======
-version = "0.1.0"
-requires-python = ">=3.10"
-keywords = []
 
->>>>>>> after updating
 classifiers = [
     "Development Status :: 4 - Beta",
     "License :: OSI Approved :: Apache Software License",