git.iko.soy/typeable/servant
on master help sign in
Fix rebase issues.
5909a6dJulian K. Arni
servant-docs/src/Servant/Docs/Internal.hs−1
compare with master
unifiedsplit
@@ -718,7 +718,6 @@ instance OVERLAPPING_
718instance OVERLAPPABLE_
718instance OVERLAPPABLE_
719 (ToSample a, AllMimeRender (ct ': cts) a)
719 (ToSample a, AllMimeRender (ct ': cts) a)
720 => HasDocs (Get (ct ': cts) a) where
720 => HasDocs (Get (ct ': cts) a) where
721−>>>>>>> Simplify verb combinators.
722 docsFor Proxy (endpoint, action) DocOptions{..} =
721 docsFor Proxy (endpoint, action) DocOptions{..} =
723 single endpoint' action'
722 single endpoint' action'
724
723
servant-server/src/Servant/Server/Internal.hs−1
@@ -198,7 +198,6 @@ instance OVERLAPPABLE_
198 status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
198 status = toEnum . fromInteger $ natVal (Proxy :: Proxy status)
199
199
200instance OVERLAPPING_
200instance OVERLAPPING_
201−instance
202 ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
201 ( AllCTRender ctypes a, ReflectMethod method, KnownNat status
203 , GetHeaders (Headers h a)
202 , GetHeaders (Headers h a)
204 ) => HasServer (Verb method status ctypes (Headers h a)) where
203 ) => HasServer (Verb method status ctypes (Headers h a)) where