From 458ef32eebb5920db62b10f1e254dc4caffcbe5e Mon Sep 17 00:00:00 2001
From: NormalParameter <kellermannflorian1@gmail.com>
Date: Thu, 17 Mar 2022 14:07:45 +0100
Subject: [PATCH] Update for merge

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

diff --git a/telegram_bot/bot.py b/telegram_bot/bot.py
index 1480837..26ff3e4 100644
--- 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