Fixed conflicts

4c031df7 · wsttiger · d32653a5 · ed5f9897 · 4c031df7 · 4c031df7
Commit 4c031df7 authored Nov 09, 2018 by wsttiger
4 changed files
--- a/test/shape_test.cpp
+++ b/test/shape_test.cpp
--- a/test/simplify_algebra_test.cpp
+++ b/test/simplify_algebra_test.cpp
--- a/test/simplify_reshapes_test.cpp
+++ b/test/simplify_reshapes_test.cpp
--- a/test/validate.cpp
+++ b/test/validate.cpp