chore: update go-fil-markets with identity CID fix

Ref: filecoin-project/go-fil-markets#747
filecoin-project · Nov 24, 2022 · 9b370fa · 9b370fa
1 parent 0deee0b
commit 9b370fa
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 10 deletions.
diff --git a/go.mod b/go.mod
@@ -8,12 +8,6 @@ replace github.com/filecoin-project/go-jsonrpc => github.com/nonsense/go-jsonrpc
 
 // replace github.com/filecoin-project/lotus => ../lotus
 
-// replace github.com/filecoin-project/go-fil-markets => ../go-fil-markets
-
-// replace github.com/filecoin-project/dagstore => ../dagstore
-
-// replace github.com/ipld/go-car/v2 => ../../ipld/go-car/v2
-
 require (
 	contrib.go.opencensus.io/exporter/prometheus v0.4.0
 	github.com/BurntSushi/toml v1.1.0

diff --git a/itests/framework/framework.go b/itests/framework/framework.go
@@ -59,12 +59,8 @@ import (
 	unixfile "github.com/ipfs/go-unixfs/file"
 	"github.com/ipld/go-car"
 	"github.com/libp2p/go-libp2p"
-<<<<<<< HEAD
-	"github.com/libp2p/go-libp2p/core/host"
-=======
 	"github.com/libp2p/go-libp2p-core/host"
 	"github.com/multiformats/go-multihash"
->>>>>>> 108ee6c (fix: cleanup test & handle identity roots)
 	"github.com/stretchr/testify/require"
 	"golang.org/x/sync/errgroup"
 )