github spinnt

2022-03-17 14:09:35 +01:00 · 2022-03-17 14:09:35 +01:00 · c452d23b47
commit c452d23b47
parent 0f6991210b
1 changed files with 0 additions and 4 deletions
--- a/telegram_bot/bot.py
+++ b/telegram_bot/bot.py
@ -23,11 +23,7 @@ import logging
 import json

 import news.news_fetcher as news
-<<<<<<< HEAD
-import share_fetcher
-=======
 import shares.share_fetcher as share_fetcher
->>>>>>> 2961bbb4294b603c694edd0bf0ec74661641b833

 from telebot import types
 from dotenv import load_dotenv