From 76d3ffbe08826ca4e65f3cfe97e268c524a71dc2 Mon Sep 17 00:00:00 2001
From: olivier lamy <oliver.lamy@gmail.com>
Date: Wed, 12 Aug 2020 19:38:55 +0800
Subject: [PATCH] fix merging

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 .../org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java b/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java
index 93ce0c01412..60ebe22aa2e 100644
--- a/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java
+++ b/examples/async-rest/async-rest-jar/src/main/java/org/eclipse/jetty/example/asyncrest/AsyncRestServlet.java
@@ -63,7 +63,7 @@ public class AsyncRestServlet extends AbstractRestServlet
     {
         super.init(servletConfig);
 
-        _client = new HttpClient(new SslContextFactory.Client());
+        _client = new HttpClient();
 
         try
         {