From 455c14020d0991d2640982a499a20e945043279f Mon Sep 17 00:00:00 2001
From: Simon Praetorius <simon.praetorius@tu-dresden.de>
Date: Mon, 3 Dec 2018 12:35:32 -0500
Subject: [PATCH] error after rebase corrected

---
 dune/vtk/vtkreader.impl.hh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/dune/vtk/vtkreader.impl.hh b/dune/vtk/vtkreader.impl.hh
index 65c3636..e94905f 100644
--- 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
 
-- 
GitLab