Remove binascii import

lanmomo · Oct 12, 2015 · 2846de8 · 2846de8
1 parent 402d071
commit 2846de8
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/app.py b/app.py
@@ -1,10 +1,6 @@
 #!/usr/bin/env python3
 import uuid
-<<<<<<< HEAD
 import logging
-=======
-import binascii
->>>>>>> Using hexdigest instead of digest
 
 from flask import Flask, send_from_directory, jsonify, request, session
 from logging import Formatter
@@ -56,16 +52,13 @@ def validate_signup_body(req):
     return True
 
 
-<<<<<<< HEAD
-=======
 def get_hash(password, salt):
     m = hashlib.sha512()
     m.update(salt.encode('utf8'))
     m.update(password.encode('utf8'))
     return m.digest()
 
 
->>>>>>> Using hexdigest instead of digest
 def email_exists(email):
     return User.query.filter(User.email == email).count() > 0