fixing merge conflicts

ethersphere · Aug 28, 2019 · eb87983 · eb87983
1 parent 7e48573
commit eb87983
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/swarm.go b/swarm.go
@@ -225,11 +225,7 @@ func NewSwarm(config *api.Config, mockStore *mock.NodeStore) (self *Swarm, err e
 
 	self.bzz = network.NewBzz(bzzconfig, to, self.stateStore, self.streamer.GetSpec(), self.streamer.Run)
 
-<<<<<<< HEAD
 	self.bzzEth = bzzeth.New()
-=======
-	self.bzzEth = bzzeth.New(self.netStore, to)
->>>>>>> a8d778075bcbb7389bcdba9d92f826e4e3fcd998
 
 	// Pss = postal service over swarm (devp2p over bzz)
 	self.ps, err = pss.New(to, config.Pss)