Skip to content

Commit e4839c6

Browse files
committed
fixup! Generalise over the Swagger datatype.
1 parent 40b32a7 commit e4839c6

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

servant-swagger-ui-jensoleg/servant-swagger-ui-jensoleg.cabal

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ library
8484
ghc-options: -Wall
8585
build-depends: servant-swagger-ui-core >=0.3.6 && <0.4
8686
build-depends:
87-
<<<<<<< HEAD
8887
base >=4.7 && <4.17
8988
, bytestring >=0.10.4.0 && <0.12
9089
, file-embed-lzma >=0 && <0.1

0 commit comments

Comments
 (0)