Fixing conflict

src/FiniteDifference/FDScheme.hpp

@@ -10,7 +10,7 @@
 
 #include "../Matrix/SparseMatrix.hpp"
 #include "Grid/grid_dist_id.hpp"
-#include "Grid/grid_dist_id_iterator_sub.hpp"
+#include "Grid/Iterators/grid_dist_id_iterator_sub.hpp"
 #include "eq.hpp"
 #include "data_type/scalar.hpp"
 #include "NN/CellList/CellDecomposer.hpp"

src/main.cpp

+#include "config.h"
+#undef VERSION
 #define BOOST_TEST_MODULE "C++ test module for OpenFPM_numerics project"
 #include <boost/test/included/unit_test.hpp>
 
@@ -13,4 +15,4 @@
 #include "util/util_num_unit_tests.hpp"
 #include "PSE/Kernels_unit_tests.hpp"
 #include "Operators/Vector/vector_dist_operators_unit_tests.hpp"
-#include "Draw/DrawParticles_unit_tests.hpp"
+//#include "Draw/DrawParticles_unit_tests.hpp"