From 7be951b9626df6b96d5583e65c3f8ef6ec43f7be Mon Sep 17 00:00:00 2001
From: Jeff Becker <ampernand@gmail.com>
Date: Fri, 23 Dec 2016 07:38:41 -0500
Subject: [PATCH] fix last commit, it was broken

---
 I2PTunnel.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/I2PTunnel.cpp b/I2PTunnel.cpp
index 756a22c2..7ec4352d 100644
--- a/I2PTunnel.cpp
+++ b/I2PTunnel.cpp
@@ -177,7 +177,7 @@ namespace client
 			{
 				if (bytes_transferred > 0)
 					Write (m_StreamBuffer, bytes_transferred); // postpone termination
-				else if (ecode == boost::asio::error::timed_out && && m_Stream && m_Stream->IsOpen ())
+				else if (ecode == boost::asio::error::timed_out && m_Stream && m_Stream->IsOpen ())
 					StreamReceive ();
 				else
 					Terminate ();
@@ -553,7 +553,6 @@ namespace client
 				++itr;
 		}
   }
-<<<<<<< HEAD
 
 	void I2PUDPClientTunnel::ExpireStale(const uint64_t delta) {
 		std::lock_guard<std::mutex> lock(m_SessionsMutex);