[gentoo-commits] proj/webapp-config:master commit in: WebappConfig/

["Devan Franchini" <twitch153@gentoo.org>]

commit:     c41a4b0cccc8425a9e00bd1c4cebaf50c058588f
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 29 02:17:00 2013 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Tue Oct 29 02:17:00 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=c41a4b0c

WebappConfig/compat.py: Alters warped compat file from cherry-picking.

---
 WebappConfig/compat.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/WebappConfig/compat.py b/WebappConfig/compat.py
index 526b1bc..3e567dc 100644
--- a/WebappConfig/compat.py
+++ b/WebappConfig/compat.py
@@ -18,15 +18,5 @@
 import  hashlib
 
 def create_md5(filename):
-<<<<<<< HEAD
-    if hex(sys.hexversion) >= '0x3020000':
-        filename = open(filename).read()
-        encoded_file = filename.encode('utf8')
-        return str(hashlib.md5(encoded_file).hexdigest())
-    else:
-        return str(hashlib.md5(open(filename).read()).hexdigest())
-=======
     with open(filename, 'rb') as f:
         return str(hashlib.md5(f.read()).hexdigest())
->>>>>>> 04e9a55... WebappConfig/compat.py: Revamps create_md5() function.
-