Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove conflict with proxy-manager, but add it as a dev dep instead b…
…ecause we only need it because there was a bug in 2.13
- Loading branch information