resolve trial conflict

This commit is contained in:
Chris Dornan 2020-04-29 17:42:51 +01:00
commit 1d24e742f2

View File

@ -11,7 +11,10 @@ cabal-format-version: "2.4"
packages: packages:
"Marcin Rzeźnicki <marcin.rzeznicki@gmail.com> @marcin-rzeznicki": "Marcin Rzeźnicki <marcin.rzeznicki@gmail.com> @marcin-rzeznicki":
- hspec-tables - hspec-tables
"Mauricio Fierro <mauriciofierrom@gmail.com> @mauriciofierrom":
- dialogflow-fulfillment
"Mihai Giurgeanu <mihai.giurgeanu@gmail.com> @mihaigiurgeanu": "Mihai Giurgeanu <mihai.giurgeanu@gmail.com> @mihaigiurgeanu":
- sqlcli - sqlcli
- sqlcli-odbc - sqlcli-odbc
@ -523,7 +526,7 @@ packages:
"Pranay Sashank <pranaysashank@gmail.com> @pranaysashank": "Pranay Sashank <pranaysashank@gmail.com> @pranaysashank":
- fusion-plugin-types - fusion-plugin-types
- fusion-plugin < 0 # ghc-8.8.3 - fusion-plugin
"Aleksey Uimanov <s9gf4ult@gmail.com> @s9gf4ult": "Aleksey Uimanov <s9gf4ult@gmail.com> @s9gf4ult":
# - postgresql-query # build errors # - postgresql-query # build errors
@ -3636,7 +3639,7 @@ packages:
"Holmusk <tech@holmusk.com> @arbus": "Holmusk <tech@holmusk.com> @arbus":
- elm-street < 0 # via base-4.13.0.0 & warp-3.3.2 - elm-street < 0 # via base-4.13.0.0 & warp-3.3.2
"Noel Kwan <noelkwan1998@gmail.com> @kwannoel": "Noel Kwan <noelkwan1998@gmail.com> @kwannoel":
- servant-docs-simple - servant-docs-simple