on master help sign in
resolve trial conflict
commit1d24e742f2bbf039f5dd3389a6f9b4a4635dd262 authorChris Dornan <chris@chrisdornan.com> dateWed 29 Apr 2020, 17:42 (6 years ago) parent70efd11a894cf4
1 file changed+6−3
build-constraints.yaml+6−3
build-constraints.yaml+6−3
@@ -11,7 +11,10 @@ cabal-format-version: "2.4"
1111packages:
1212 "Marcin Rzeźnicki <marcin.rzeznicki@gmail.com> @marcin-rzeznicki":
1313 - hspec-tables
14−
14+
15+ "Mauricio Fierro <mauriciofierrom@gmail.com> @mauriciofierrom":
16+ - dialogflow-fulfillment
17+
1518 "Mihai Giurgeanu <mihai.giurgeanu@gmail.com> @mihaigiurgeanu":
1619 - sqlcli
1720 - sqlcli-odbc
@@ -523,7 +526,7 @@ packages:
523526
524527 "Pranay Sashank <pranaysashank@gmail.com> @pranaysashank":
525528 - fusion-plugin-types
526− - fusion-plugin < 0 # ghc-8.8.3
529+ - fusion-plugin
527530
528531 "Aleksey Uimanov <s9gf4ult@gmail.com> @s9gf4ult":
529532 # - postgresql-query # build errors
@@ -3636,7 +3639,7 @@ packages:
36363639
36373640 "Holmusk <tech@holmusk.com> @arbus":
36383641 - elm-street < 0 # via base-4.13.0.0 & warp-3.3.2
3639−
3642+
36403643 "Noel Kwan <noelkwan1998@gmail.com> @kwannoel":
36413644 - servant-docs-simple
36423645