Commit 91de3907 authored by Pietro Incardona's avatar Pietro Incardona

Resolving merge conflict

parents e4b8762c 09a83aea
......@@ -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>
......
This diff is collapsed.
This diff is collapsed.
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