From 88413800fff2ccdd4583871872a4d6db587e71cf Mon Sep 17 00:00:00 2001
From: Dominic <git@msrd0.de>
Date: Wed, 26 Aug 2020 18:37:48 +0200
Subject: [PATCH] fix merge

---
 gotham/src/test.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gotham/src/test.rs b/gotham/src/test.rs
index 8ee04a9da..cb33413aa 100644
--- a/gotham/src/test.rs
+++ b/gotham/src/test.rs
@@ -57,7 +57,7 @@ pub trait Server: Clone {
                         future::Either::Right(_) => Err(anyhow!("timed out")),
                     })
                 })
-                .into_future(),
+                .into_future()
                 .map_err(|error| error.into()),
         )
     }