fix changelog merge conflict

This commit is contained in:
Jack Robison 2017-10-25 12:05:46 -04:00
parent e4d2a3d2ec
commit f3d45061e8
No known key found for this signature in database
GPG key ID: 284699E7404E3CFF

View file

@ -29,7 +29,6 @@ at anytime.
* Use the first port available for the peer and dht ports, starting with the provided values (defaults of 3333 and 4444). This allows multiple lbrynet instances in a LAN with UPnP.
* Detect a UPnP redirect that didn't get cleaned up on a previous run and use it
* Bumped jsonschema requirement to 2.6.0
* Moved tests into the lbrynet package.
* Refactor some assert statements to accommodate the PYTHONOPTIMIZE flag set for Android.
### Added