chore(quic): rebase on master to support quic

berty · Apr 16, 2020 · 09bb2b2 · 09bb2b2
1 parent 2025af7
commit 09bb2b2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/go.mod b/go.mod
diff --git a/go/cmd/berty/mini/main.go b/go/cmd/berty/mini/main.go
@@ -11,17 +11,17 @@ import (
 	"berty.tech/berty/v2/go/pkg/bertyprotocol"
 	"berty.tech/berty/v2/go/pkg/bertytypes"
 	"github.com/gdamore/tcell"
+
 	datastore "github.com/ipfs/go-datastore"
 	sync_ds "github.com/ipfs/go-datastore/sync"
 	p2plog "github.com/ipfs/go-log"
+
 	"github.com/juju/fslock"
 	"github.com/libp2p/go-libp2p-core/peer"
 	"github.com/multiformats/go-multiaddr"
 	"github.com/rivo/tview"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
-
-	p2plog "github.com/ipfs/go-log"
 )
 
 type Opts struct {