Krish Moodbidri
--- a/tasks.py

+ 0

− 4
+++ b/tasks.py

+ 0

− 4
 @@ -94,11 +94,7 @@ def celery_certify_account(json, session):
    print("CERTIFY : "+time.strftime("%m-%d-%Y_%H:%M:%S") + '\tUser ' + username + ' added to queue')
    send_msg('certifying account', room)
    print(username)
-<<<<<<< HEAD
    rc_util.certify_account(username, queuename, updated_by, 'ok', 'all')
-=======
-    rc_util.certify_account(username, queuename, 'ok', 'all')
->>>>>>> parent of bcc5650... Added updated_by field
    print('sent account info')
    print('Waiting for certification...')
    rc_util.consume(queuename, routing_key=f'certified.{queuename}', callback=certify_gen_f(room))