From ba38e0f98d0aade302e17ab3457cae0adf22acb6 Mon Sep 17 00:00:00 2001
From: Yong Wen Chua <me@yongwen.xyz>
Date: Mon, 17 Jul 2017 16:13:35 +0800
Subject: [PATCH] Fix merge error

---
 src/lib.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index 80a26bc..1247e0a 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -291,7 +291,7 @@ impl AllOrSome<HashSet<Url>> {
     }
 }
 
-/// Response generator and [Fairing](https://rocket.rs/guide/fairings/) for CORS
+/// A wrapper type around `rocket::http::Method` to support serialization and deserialization
 #[derive(Clone, Copy, PartialEq, Eq, Hash, Debug)]
 pub struct Method(http::Method);
 
@@ -363,6 +363,7 @@ impl<'de> Deserialize<'de> for Method {
     }
 }
 
+/// Response generator and [Fairing](https://rocket.rs/guide/fairings/) for CORS
 ///
 /// This struct can be as Fairing or in an ad-hoc manner to generate CORS response.
 ///