From 875e3329977e680e36333e4b0a2dc63beea72312 Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Thu, 18 Feb 2010 05:19:20 +0000
Subject: [PATCH] fixed merge error

---
 src/peer_connection.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/peer_connection.cpp b/src/peer_connection.cpp
index 8888bd076..89003e68d 100644
--- a/src/peer_connection.cpp
+++ b/src/peer_connection.cpp
@@ -2255,7 +2255,6 @@ namespace libtorrent
 			// the other end dropped the request.
 			if (m_ses.m_settings.drop_skipped_requests
 				&& qe.skipped > m_desired_queue_size)
-			if (qe.skipped > m_desired_queue_size)
 			{
 				if (m_ses.m_alerts.should_post<request_dropped_alert>())
 					m_ses.m_alerts.post_alert(request_dropped_alert(t->get_handle()