Commit 3d2e59b8 authored by Max Lyon's avatar Max Lyon

Merge branch 'master' into v2beta

Conflicts:
	CI/ci-mac.sh
	VERSION
	src/Unittests/unittests_files.cc
parents cc84b82c b5b9aad9
Pipeline #1695 passed with stage
......@@ -48,7 +48,6 @@ cd Unittests
cd ..
cd ..
#########################################
# Build Debug version and Unittests
#########################################
......@@ -67,7 +66,6 @@ make
#build the unit tests
make unittests
#########################################
# Run Debug Unittests
#########################################
......
......@@ -4,6 +4,7 @@
#include <OpenVolumeMesh/FileManager/FileManager.hh>
using namespace OpenVolumeMesh;
using namespace Geometry;
TEST_F(PolyhedralMeshBase, LoadFile) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment