error after rebase corrected

455c1402 · Praetorius, Simon · 1d396e0e · 455c1402
Commit 455c1402 authored Dec 03, 2018 by Praetorius, Simon
--- a/dune/vtk/vtkreader.impl.hh
+++ b/dune/vtk/vtkreader.impl.hh
@@ -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