From 984c22167b64dc17b1608560a0bca28452578d51 Mon Sep 17 00:00:00 2001
From: Yelizaveta <elizavetaa40@gmail.com>
Date: Fri, 15 Sep 2023 13:52:36 +0300
Subject: [PATCH] conflicts resolved

---
 bot.py | 2 +-
 db.py  | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/bot.py b/bot.py
index fcfcc89..137960d 100644
--- a/bot.py
+++ b/bot.py
@@ -278,4 +278,4 @@ def process(token_):
         work_queue.put(token)
     for i in range(len(tokens)):
         worker = Worker(work_queue)
-        worker.start()
\ No newline at end of file
+        worker.start()
diff --git a/db.py b/db.py
index 205e111..a78d785 100644
--- a/db.py
+++ b/db.py
@@ -375,4 +375,5 @@ def get_users_not_answer_last24hours():
 
 
 def auth_in_db(username, password):
-    connect(f'mongodb://{username}:{password}@db:27017/{DATABASE_NAME}?authSource=admin')
\ No newline at end of file
+    connect(f'mongodb://{username}:{password}@db:27017/{DATABASE_NAME}?authSource=admin')
+    
\ No newline at end of file