From 7a592c4b0506f8e03e94a87e4d13d6d941ac7b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ferenc=20N=C3=A1n=C3=A1si?= <husudosu94@gmail.com>
Date: Sat, 1 Feb 2020 17:10:22 +0100
Subject: [PATCH] Some VSCode bug happened it made some conflicts

---
 tests/test_sukebei.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/tests/test_sukebei.py b/tests/test_sukebei.py
index e961c17..eebaaf6 100644
--- a/tests/test_sukebei.py
+++ b/tests/test_sukebei.py
@@ -1,13 +1,6 @@
 from NyaaPy import SukebeiNyaa
-<<<<<<< HEAD
 from datetime import datetime
 import json
-=======
-from pprint import pprint
-from datetime import datetime
-import json
-import sys
->>>>>>> 5c93e516ba364d448335ebdc6989f8e1724c88c7
 import os
 
 # Creating a folder for test_files