Fixed merge error.

This commit is contained in:
Simone Bordet 2013-02-27 19:50:46 +01:00
parent f28bd1d010
commit a3400f0092
1 changed files with 1 additions and 1 deletions

View File

@ -24,10 +24,10 @@ import java.util.Set;
import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import javax.servlet.DispatcherType;
import org.eclipse.jetty.jmx.MBeanContainer;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.DispatcherType;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.nio.SelectChannelConnector;
import org.eclipse.jetty.servlet.FilterHolder;