From a465051c1a67893882f6ebce7da3147e71adaed3 Mon Sep 17 00:00:00 2001
From: Piper Merriam <pipermerriam@gmail.com>
Date: Wed, 28 Dec 2016 11:25:55 -0700
Subject: [PATCH] merge conflict

---
 web3/providers/rpc.py | 37 -------------------------------------
 1 file changed, 37 deletions(-)

diff --git a/web3/providers/rpc.py b/web3/providers/rpc.py
index 156fc57..3dd9399 100644
--- a/web3/providers/rpc.py
+++ b/web3/providers/rpc.py
@@ -160,40 +160,3 @@ class KeepAliveRPCProvider(JSONBaseProvider):
         response = self.client.post(self.path, body=request_data)
         response_body = response.read()
         return response_body
-<<<<<<< Updated upstream
-
-
-def is_testrpc_available():
-    try:
-        import testrpc  # noqa: F401
-        return True
-    except ImportError:
-        return False
-
-
-class TestRPCProvider(RPCProvider):
-    def __init__(self, host="127.0.0.1", port=8545, *args, **kwargs):
-        if not is_testrpc_available():
-            raise Exception("`TestRPCProvider` requires the `eth-testrpc` package to be installed")
-        from gevent.pywsgi import WSGIServer
-        from testrpc.server import get_application
-
-        try:
-            logger = kwargs.pop('logger')
-        except KeyError:
-            logger = logging.getLogger('testrpc')
-
-        application = get_application()
-
-        self.server = WSGIServer(
-            (host, port),
-            application,
-            log=logger,
-            error_log=logger,
-        )
-
-        self.thread = gevent.spawn(self.server.serve_forever)
-
-        super(TestRPCProvider, self).__init__(host, str(port), *args, **kwargs)
-=======
->>>>>>> Stashed changes