resolve conflicts 2

sustainable-processes · Jul 13, 2020 · 9dddba8 · 9dddba8
1 parent da6a88c
commit 9dddba8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,8 +24,8 @@ matplotlib = "^3.2.2"
 neptune-client = {version= "^0.4.115", optional = true}
 hiplot = {version= "^0.1.12", optional = true}
 neptune-contrib = {extras = ["viz"], version = "^0.22.0", optional=true}
-tensorflow = "^2.2.0"
 gryffin = {git = "https://github.com/sustainable-processes/gryffin.git"}
+tensorflow = "^2.2.0"
 tensorflow-probability = "^0.10.1"
 torch = "1.4.0"
 blitz-bayesian-pytorch = "0.2.3"