Fix rebase issues.

2016-01-06 17:17:14 +01:00 · 2016-01-06 17:17:14 +01:00 · 5909a6df7a
commit 5909a6df7a
parent 9b2d7a7b38
2 changed files with 0 additions and 2 deletions
--- a/servant-docs/src/Servant/Docs/Internal.hs
+++ b/servant-docs/src/Servant/Docs/Internal.hs
@ -718,7 +718,6 @@ instance OVERLAPPING_
 instance OVERLAPPABLE_
        (ToSample a, AllMimeRender (ct ': cts) a)
    => HasDocs (Get (ct ': cts) a) where
->>>>>>> Simplify verb combinators.
  docsFor Proxy (endpoint, action) DocOptions{..} =
    single endpoint' action'

--- a/servant-server/src/Servant/Server/Internal.hs
+++ b/servant-server/src/Servant/Server/Internal.hs
@ -198,7 +198,6 @@ instance OVERLAPPABLE_
          status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)

 instance OVERLAPPING_
-instance
         ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
         , GetHeaders (Headers h a)
         ) => HasServer (Verb method status ctypes (Headers h a)) where