Update for merge

2022-03-17 14:07:45 +01:00 · 2022-03-17 14:07:45 +01:00 · 458ef32eeb
commit 458ef32eeb
parent 7c40f12703
1 changed files with 0 additions and 5 deletions
--- a/telegram_bot/bot.py
+++ b/telegram_bot/bot.py
@ -21,13 +21,8 @@ import time
 import sys
 import logging

-<<<<<<< HEAD
-import news_fetcher
-import share_fetcher
-=======
 import news.news_fetcher as news
 import share_fetcher
->>>>>>> 725f9806b7109b68219cc273edc616c1059ee4bb

 from telebot import types
 from dotenv import load_dotenv