mirror of
https://github.com/jackeilles/xygt.git
synced 2025-02-19 22:28:16 +01:00
didnt realise git did that
This commit is contained in:
parent
0e7fb3cfcf
commit
af502f91b0
1 changed files with 1 additions and 4 deletions
|
@ -120,8 +120,6 @@ def idInfo(id):
|
|||
# Return the mongodb info about the file, removing IP if its present
|
||||
return check
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
def userInfo(id):
|
||||
# Grab user entry from userID
|
||||
user = Config.users.find_one({"userid": id})
|
||||
|
@ -161,7 +159,6 @@ def userInfo(id):
|
|||
}
|
||||
}
|
||||
|
||||
>>>>>>> 3063133 (dict name wrong)
|
||||
def randomHex():
|
||||
hexRand = ''.join(secrets.choice('0123456789abcdef') for _ in range(6))
|
||||
return hexRand
|
||||
|
@ -194,4 +191,4 @@ def resetIDPass(userid):
|
|||
Config.users.update_one({"userid": userid}, {"$set": {"idpass": hashedPass}})
|
||||
return idpass
|
||||
except:
|
||||
return False
|
||||
return False
|
||||
|
|
Loading…
Add table
Reference in a new issue