Closed mk-pmb closed 8 years ago
No idea why github doesn't pick up my edit conflict resolution. I'll retry the PR.
2nd attempt (redone from scratch) doesn't seem to avoid the merge conflict either. I hope you can still merge it somehow.
@jfhbrook can not merge in a pull request that is not based of the master branch. You need to pull from the master branch and then create a branch from that, before you make your changes.
Edit: Now that I see the commit hashes my git merged, I think I messed up the clone-ing in the first place. I'll try again. Edit 2: I checked out 0151005 now, and with that, the "malformed" tests do succeed, so this PR is obsolete. Sorry for the buzz.
Fixes #170, a test timeout due to dangling listeners.