From 34a708e399fd655c311a4d7933a78e7822588953 Mon Sep 17 00:00:00 2001
From: Martin Holst Swende <martin@swende.se>
Date: Mon, 10 Aug 2020 10:42:33 +0200
Subject: [PATCH] eth/downloader: allow all timers to exit

# Conflicts:
#	eth/downloader/statesync.go
---
 to-merge.txt | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/to-merge.txt b/to-merge.txt
index ea28fc3ec6..8eb9325da2 100644
--- a/to-merge.txt
+++ b/to-merge.txt
@@ -40,18 +40,3 @@ Date:   Mon Aug 10 14:33:22 2020 +0300
 
     ethstats: split read and write lock, otherwise they'll lock up
 
-commit cbbc54c4956968ef240ec2610444bb30b74333a0
-Merge: 48b484c5a 7cee2509c
-Author: PÃ©ter SzilÃ¡gyi <peterke@gmail.com>
-Date:   Mon Aug 10 12:08:46 2020 +0300
-
-    Merge pull request #21433 from holiman/statsync_exiter
-    
-    eth/downloader: allow all timers to exit
-
-commit 7cee2509c07e5514dc7647fcf8a4f066feaaa6df
-Author: Martin Holst Swende <martin@swende.se>
-Date:   Mon Aug 10 10:42:33 2020 +0200
-
-    eth/downloader: allow all timers to exit
-
-- 
GitLab