Some VSCode bug happened it made some conflicts

This commit is contained in:
Ferenc Nánási
2020-02-01 17:10:22 +01:00
committed by GitHub
parent cc565bf945
commit 7a592c4b05

View File

@@ -1,13 +1,6 @@
from NyaaPy import SukebeiNyaa from NyaaPy import SukebeiNyaa
<<<<<<< HEAD
from datetime import datetime from datetime import datetime
import json import json
=======
from pprint import pprint
from datetime import datetime
import json
import sys
>>>>>>> 5c93e516ba364d448335ebdc6989f8e1724c88c7
import os import os
# Creating a folder for test_files # Creating a folder for test_files