please switch to 'cmake' based builds

diff --git a/docs/zzipdoc/htm2dbk.py b/docs/zzipdoc/htm2dbk.py
index 021a22a7ddba8c2ff73b43282956047a7e6455a9..d0f17cc3d233643d66c8f6416d1808011080ee8b 100644 (file)
--- 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):