xevion/exercism
1
0
Fork 0
mirror of https://github.com/Xevion/exercism.git synced 2025-12-06 23:14:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge fixes

Browse Source
This commit is contained in:
Xevion
2019-07-23 23:09:05 -05:00
parent dd2174c65a
commit d75b7d8faf
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
track_comments.py
View File

@@ -82,11 +82,6 @@ for track in tracks.keys():
file.write(markdown)
print('Wrote {} KiB file for {} track'.format(round(os.path.getsize(path) / 1024, 2), track))
t2 = time.time()
<<<<<<< HEAD
# Sorry for this ridiculously long line. ;-;
print('Downloaded {} MiB in webpages.\nDownloaded & parsed in {} seconds with {}ms on average request time.'.format(round(sum([i[1] for i in request_timings]) / (1024 ** 2), 2), round(t2 - t1, 2), round((sum(i[0] for i in request_timings) / len(request_timings)) * 1000, 2)))
=======
# Sorry for this ridiculously long line. ;-;
print('Downloaded {} MiB in webpages.\nDownloaded & Parsed in {} seconds with {}ms on average request time.'.format(round(sum([i[1] for i in request_timings]) / (1024 ** 2), 2), round(t2 - t1, 2), round((sum(i[0] for i in request_timings) / len(request_timings)) * 1000, 2)))
>>>>>>> refs/remotes/origin/master