Commit 455c1402 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

error after rebase corrected

parent 1d396e0e
......@@ -3,11 +3,7 @@
#include <iterator>
#include <string>
<<<<<<< 0d5e1c63fbeb492af8b00cdfbddbcd516e2805af
#ifdef HAVE_VTK_ZLIB
=======
#if HAVE_VTK_ZLIB
>>>>>>> parallel vtk reader partially implemented
#include <zlib.h>
#endif
......
Supports Markdown
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