Fix rebase issues.
commit5909a6df7aa8764db805594d0e08a474a0d398a9
authorJulian K. Arni <jkarni@gmail.com>
dateWed 6 Jan 2016, 17:17 (11 years ago)
parent9b2d7a7
servant-docs/src/Servant/Docs/Internal.hs−1
@@ -718,7 +718,6 @@ instance OVERLAPPING_
718718instance OVERLAPPABLE_
719719 (ToSample a, AllMimeRender (ct ': cts) a)
720720 => HasDocs (Get (ct ': cts) a) where
721−>>>>>>> Simplify verb combinators.
722721 docsFor Proxy (endpoint, action) DocOptions{..} =
723722 single endpoint' action'
724723
servant-server/src/Servant/Server/Internal.hs−1
@@ -198,7 +198,6 @@ instance OVERLAPPABLE_
198198 status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
199199
200200instance OVERLAPPING_
201−instance
202201 ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
203202 , GetHeaders (Headers h a)
204203 ) => HasServer (Verb method status ctypes (Headers h a)) where