Some VSCode bug happened it made some conflicts

2020-02-01 17:10:22 +01:00
parent cc565bf945
commit 7a592c4b05
1 changed files with 0 additions and 7 deletions
--- 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