diff --git a/app.py b/app.py index dfeffa3..0474e43 100755 --- 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,8 +52,6 @@ def validate_signup_body(req): return True -<<<<<<< HEAD -======= def get_hash(password, salt): m = hashlib.sha512() m.update(salt.encode('utf8')) @@ -65,7 +59,6 @@ def get_hash(password, salt): return m.digest() ->>>>>>> Using hexdigest instead of digest def email_exists(email): return User.query.filter(User.email == email).count() > 0