From d824cb30575371a6e6c703ec8bcb3d61ead5eceb Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Thu, 17 Nov 2011 13:22:47 +1100
Subject: [PATCH] Fix up merge

---
 .../src/main/java/org/eclipse/jetty/nested/NestedConnection.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedConnection.java b/jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedConnection.java
index b5fc5738bb3..a8bf06a6567 100644
--- a/jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedConnection.java
+++ b/jetty-nested/src/main/java/org/eclipse/jetty/nested/NestedConnection.java
@@ -24,7 +24,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.eclipse.jetty.http.HttpFields;
 import org.eclipse.jetty.http.HttpURI;
 import org.eclipse.jetty.io.Connection;
-import org.eclipse.jetty.server.HttpConnection;
 import org.eclipse.jetty.server.AbstractHttpConnection;