fix merge conflicts

ObolNetwork · May 30, 2022 · d8a25b8 · d8a25b8
2 parents 97df702 + 704bc69
commit d8a25b8
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/p2p/peer.go b/p2p/peer.go
@@ -41,6 +41,9 @@ type Peer struct {
 	// Index is the order of this node in the cluster.
 	// This is only applicable to charon nodes, not relays.
 	Index int
+
+	// Name represents a human friendly name for the peer.
+	Name string
 }
 
 // NewPeer returns a new charon peer.