From f3d45061e8b511b4a80f0a439cb144ad208d6bd4 Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Wed, 25 Oct 2017 12:05:46 -0400
Subject: [PATCH] fix changelog merge conflict

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d1086763..7a2adfda1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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