Fixed merge conflict.

2015-02-12 14:40:43 +01:00 · 2015-02-12 14:40:43 +01:00 · 38b5c11d25
parent 465f6f7da8
commit 38b5c11d25
1 changed files with 1 additions and 1 deletions
--- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
+++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
@ -694,7 +694,7 @@ public class ProxyServletTest
    {
        final String target = "/test";
        final String query = "a=1&b=2&c=1234%205678&d=hello+world";
-        prepareServer(new HttpServlet()
+        startServer(new HttpServlet()
        {
            @Override
            protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException