From e94660b7ba047df0f8cc3bb529fdecb1959b3601 Mon Sep 17 00:00:00 2001
From: Greg Wilkins <gregw@webtide.com>
Date: Thu, 13 Jul 2017 16:51:24 +0200
Subject: [PATCH] fixed merge

---
 .../src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
index 52fd04c6a4e..51f9d40ccc3 100644
--- a/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
+++ b/jetty-proxy/src/test/java/org/eclipse/jetty/proxy/ProxyServletTest.java
@@ -1090,7 +1090,7 @@ public class ProxyServletTest
         // Make sure there is error page content, as the proxy-to-client response has been reset.
         InputStream input = listener.getInputStream();
         String body = IO.toString(input);
-        Assert.assertThat(body,Matchers.containsString("HTTP ERROR: 504"));
+        Assert.assertThat(body,Matchers.containsString("HTTP ERROR 504"));
         chunk1Latch.countDown();
 
         // Result succeeds because a 504 is a valid HTTP response.