Restore blank lines deleted in "merge from bitbucket"

sumerc / yappi

Yet Another Python Profiler, but this time multithreading, asyncio and gevent aware.

MIT License

1.48k stars 73 forks source link

Restore blank lines deleted in "merge from bitbucket" #16

Closed orivej closed 5 years ago

orivej commented 5 years ago

0d3b2e17 in #4 has incorrectly resolved whitespace conflicts by deleting blank lines that were present on both sides of the merge. This restores those lines.