eeva/servant
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix rebase issues.

Browse source
This commit is contained in:
Julian K. Arni 2016-01-06 17:17:14 +01:00
parent 9b2d7a7b38
commit 5909a6df7a
2 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
servant-docs/src/Servant/Docs/Internal.hs
View file

@ -718,7 +718,6 @@ instance OVERLAPPING_
instance OVERLAPPABLE_ instance OVERLAPPABLE_
(ToSample a, AllMimeRender (ct ': cts) a) (ToSample a, AllMimeRender (ct ': cts) a)
=> HasDocs (Get (ct ': cts) a) where => HasDocs (Get (ct ': cts) a) where
>>>>>>> Simplify verb combinators.
docsFor Proxy (endpoint, action) DocOptions{..} = docsFor Proxy (endpoint, action) DocOptions{..} =
single endpoint' action' single endpoint' action'

1
servant-server/src/Servant/Server/Internal.hs
View file

@ -198,7 +198,6 @@ instance OVERLAPPABLE_
status = toEnum . fromInteger $ natVal (Proxy :: Proxy status) status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
instance OVERLAPPING_ instance OVERLAPPING_
instance
( AllCTRender ctypes a, ReflectMethod method, KnownNat status ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
, GetHeaders (Headers h a) , GetHeaders (Headers h a)
) => HasServer (Verb method status ctypes (Headers h a)) where ) => HasServer (Verb method status ctypes (Headers h a)) where