From df9096834a89fde2bfee0e84e35ecc0a42c8d0ac Mon Sep 17 00:00:00 2001
From: Muthu Subramanian <sumuthu@novell.com>
Date: Fri, 19 Nov 2010 21:19:20 +0530
Subject: Fixed merge problems

---
 helpcontent2/to-wiki/wikiconv2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'helpcontent2')

diff --git a/helpcontent2/to-wiki/wikiconv2.py b/helpcontent2/to-wiki/wikiconv2.py
index d0eb3a8cf4..1327e55e42 100755
--- a/helpcontent2/to-wiki/wikiconv2.py
+++ b/helpcontent2/to-wiki/wikiconv2.py
@@ -874,7 +874,7 @@ class XhpParser:
                 self.current_app = i[1]
                 break
 
-        file = open(filename, "r")
+        file = codecs.open(filename, "r", "utf-8")
         p = xml.parsers.expat.ParserCreate()
 
         p.StartElementHandler = self.start_element
-- 
cgit