From a46ac9630a46093eda88540a8ec705e6f53bcc4f Mon Sep 17 00:00:00 2001
From: Guido Draheim <guidod@gmx.de>
Date: Mon, 13 Apr 2020 13:48:16 +0200
Subject: [PATCH] please switch to 'cmake' based builds

---
 docs/zzipdoc/htm2dbk.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/docs/zzipdoc/htm2dbk.py b/docs/zzipdoc/htm2dbk.py
index 021a22a..d0f17cc 100644
--- a/docs/zzipdoc/htm2dbk.py
+++ b/docs/zzipdoc/htm2dbk.py
@@ -146,13 +146,8 @@ def htm2dbk_files(args):
             doc.filename = filename
             doc.add(f.read())
             f.close()
-<<<<<<< HEAD
-        except IOError as e:
-            print >> sys.stderr, "can not open "+filename
-=======
         except IOError:
             print("can not open "+filename, file=sys.stderr)
->>>>>>> develop
     return doc.value()
 
 def html2docbook(text):
-- 
2.40.0