From c452d23b473c6128c1ec6fe475f6a1629ac3f684 Mon Sep 17 00:00:00 2001
From: NormalParameter <kellermannflorian1@gmail.com>
Date: Thu, 17 Mar 2022 14:09:35 +0100
Subject: [PATCH] github spinnt

---
 telegram_bot/bot.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/telegram_bot/bot.py b/telegram_bot/bot.py
index 95692e2..e3e4f28 100644
--- 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