From a1c5c429b4c90ee9400649d1545e75a33e8a888e Mon Sep 17 00:00:00 2001
From: lars <Lars.Noack@outlook.de>
Date: Tue, 8 Nov 2022 17:26:42 +0100
Subject: [PATCH] resolved merge conflicts

---
 src/main.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main.py b/src/main.py
index 7acd9ff..893b57c 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,11 +1,7 @@
-<<<<<<< HEAD
-import metadata
-=======
 from metadata.database import Database
 from metadata.download import MetadataDownloader
 import metadata.download
 import metadata.search
->>>>>>> 63f30bffbae20ec3fc368a6093b28e56f0230318
 import download_links
 import url_to_path
 import download