Resolving merge conflict

91de3907 · Pietro Incardona · e4b8762c · 09a83aea · 91de3907 · 91de3907
Commit 91de3907 authored Sep 07, 2016 by Pietro Incardona
Showing with 1659 additions and 398 deletions

src/VCluster.hpp src/VCluster.hpp +1 -0

src/VCluster_semantic.ipp src/VCluster_semantic.ipp +280 -34

src/VCluster_semantic_unit_tests.hpp src/VCluster_semantic_unit_tests.hpp +1378 -364

No files found.
--- a/src/VCluster.hpp
+++ b/src/VCluster.hpp
@@ -18,6 +18,7 @@
 #endif
 #include "util/Vcluster_log.hpp"
 #include "memory/BHeapMemory.hpp"
+#include "Packer_Unpacker/has_max_prop.hpp"

 #ifdef HAVE_PETSC
 #include <petscvec.h>

--- a/src/VCluster_semantic.ipp
+++ b/src/VCluster_semantic.ipp
--- a/src/VCluster_semantic_unit_tests.hpp
+++ b/src/VCluster_semantic_unit_tests.hpp