From 1d54b11b85fb61f3dddda638c375044cd095cbcc Mon Sep 17 00:00:00 2001
From: Frank Szendzielarz <Frank@franks.technology>
Date: Tue, 4 Jun 2019 10:48:13 +0200
Subject: [PATCH] Merge fix

---
 les/protocol.go | 11 +----------
 les/server.go   | 12 ------------
 2 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/les/protocol.go b/les/protocol.go
index 2fe5920dff..8066073a9c 100644
--- a/les/protocol.go
+++ b/les/protocol.go
@@ -42,17 +42,8 @@ var (
 	AdvertiseProtocolVersions = []uint{lpv2} // clients are searching for the first advertised protocol in the list
 )
 
-<<<<<<< HEAD
-// Number of implemented message corresponding to different protocol versions.
+// ProtocolLengths is the number of implemented message corresponding to different protocol versions.
 var ProtocolLengths = map[uint]uint64{lpv2: 22, lpv3: 24}
-=======
-// ProtocolLengths - Number of implemented message corresponding to different protocol versions.
-<<<<<<< HEAD
-var ProtocolLengths = map[uint]uint64{lpv2: 22}
->>>>>>> Further LES cleanup
-=======
-var ProtocolLengths = map[uint]uint64{lpv2: 22, lpv3: 24}
->>>>>>> resolving conflicts
 
 const (
 	// NetworkID - the network id
diff --git a/les/server.go b/les/server.go
index a529e5d553..1d9ee8d36d 100644
--- a/les/server.go
+++ b/les/server.go
@@ -39,10 +39,6 @@ import (
 
 const bufLimitRatio = 6000 // fixed bufLimit/MRR ratio
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-=======
->>>>>>> resolving conflicts
 const (
 	logFileName          = ""    // csv log file name (disabled if empty)
 	logClientPoolMetrics = true  // log client pool metrics
@@ -52,12 +48,7 @@ const (
 	logProtocolHandler   = true  // log protocol handler events
 )
 
-<<<<<<< HEAD
-=======
-=======
->>>>>>> resolving conflicts
 // LesServer is a node service running a LES server
->>>>>>> Correcting documentation format
 type LesServer struct {
 	lesCommons
 
@@ -310,10 +301,7 @@ func (s *LesServer) SetBloomBitsIndexer(bloomIndexer *core.ChainIndexer) {
 func (s *LesServer) Stop() error {
 	s.fcManager.Stop()
 	s.chtIndexer.Close()
-<<<<<<< HEAD
-=======
 
->>>>>>> resolving conflicts
 	// bloom trie indexer is closed by parent bloombits indexer
 	go func() {
 		<-s.protocolManager.noMorePeers