Skip to content

Commit

Permalink
fix error after conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
LexLuthr committed Jun 19, 2023
1 parent 00b708e commit 45883c6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
7 changes: 1 addition & 6 deletions node/modules/storageminer.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ import (
"github.com/filecoin-project/boost-gfm/retrievalmarket"
retrievalimpl "github.com/filecoin-project/boost-gfm/retrievalmarket/impl"
rmnet "github.com/filecoin-project/boost-gfm/retrievalmarket/network"
"github.com/filecoin-project/boost/lib/mpoolmonitor"
"github.com/filecoin-project/boost/markets/pricing"
"github.com/filecoin-project/boost/storagemarket/lp2pimpl"
"github.com/filecoin-project/go-state-types/big"
piecestoreimpl "github.com/filecoin-project/boost-gfm/piecestore/impl"
"github.com/filecoin-project/boost-gfm/retrievalmarket"
"github.com/filecoin-project/boost-gfm/shared"
gfm_storagemarket "github.com/filecoin-project/boost-gfm/storagemarket"
storageimpl "github.com/filecoin-project/boost-gfm/storagemarket/impl"
Expand All @@ -43,6 +37,7 @@ import (
"github.com/filecoin-project/boost/storagemanager"
"github.com/filecoin-project/boost/storagemarket"
"github.com/filecoin-project/boost/storagemarket/logs"
"github.com/filecoin-project/boost/storagemarket/lp2pimpl"
"github.com/filecoin-project/boost/storagemarket/sealingpipeline"
"github.com/filecoin-project/boost/storagemarket/types"
"github.com/filecoin-project/boost/transport/httptransport"
Expand Down
1 change: 0 additions & 1 deletion storagemarket/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"sync"
"time"

"github.com/filecoin-project/boost-gfm/piecestore"
"github.com/filecoin-project/boost-gfm/storagemarket"
"github.com/filecoin-project/boost/api"
"github.com/filecoin-project/boost/build"
Expand Down

0 comments on commit 45883c6

Please sign in to comment.