Fix merge conflicts and update materialization

IntersectMBO · Jul 29, 2021 · 16f1ceb · 16f1ceb
1 parent 0bc6aed
commit 16f1ceb
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-contract.nix b/nix/pkgs/haskell/materialized-darwin/.plan.nix/plutus-contract.nix
diff --git a/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-contract.nix b/nix/pkgs/haskell/materialized-linux/.plan.nix/plutus-contract.nix
diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-contract.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-contract.nix
diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-core.nix
diff --git a/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx.nix b/nix/pkgs/haskell/materialized-windows/.plan.nix/plutus-tx.nix
diff --git a/plutus-contract/plutus-contract.cabal b/plutus-contract/plutus-contract.cabal
@@ -195,5 +195,5 @@ test-suite plutus-contract-test
         plutus-tx -any,
         freer-simple -any,
         aeson -any,
-        semigroupoids -any
+        semigroupoids -any,
         plutus-tx-plugin -any