update to fix merge conflicts

pph-collective · Apr 11, 2023 · 3d184f5 · 3d184f5
2 parents a56ba32 + 7ddab00
commit 3d184f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,4 +34,4 @@ results/*/*.txt
 profile.prof
 site/
 
-.DS_Store
+.DS_Store
diff --git a/docs/.Rhistory b/docs/.Rhistory
diff --git a/pyproject.toml b/pyproject.toml
@@ -12,11 +12,11 @@ classifiers = ["Operating System :: OS Independent"]
 packages = [{ include = "titan" }]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "^3.6"
 paraml= "^0.1"
 networkx = "^2.4"
 nanoid = "^2.0"
-numpy = "^1.23"
+numpy = "^1.18"
 black = {version = "^23.1.0", optional = true}
 flake8 = {version = "^3.8", optional = true}
 mypy = {version = "^1.0.0", optional = true}