From 84a9c8ba82769466626161632ba5ba0777c98501 Mon Sep 17 00:00:00 2001
From: Frank Szendzielarz <Frank@franks.technology>
Date: Tue, 4 Jun 2019 09:57:40 +0200
Subject: [PATCH] resolving conflicts

---
 les/protocol.go |  4 ++++
 les/server.go   | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/les/protocol.go b/les/protocol.go
index 53fb863643..2fe5920dff 100644
--- a/les/protocol.go
+++ b/les/protocol.go
@@ -47,8 +47,12 @@ var (
 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 2d85e8c738..a529e5d553 100644
--- a/les/server.go
+++ b/les/server.go
@@ -40,6 +40,9 @@ 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
@@ -49,7 +52,10 @@ 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 {
@@ -304,6 +310,10 @@ 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