From 8dfcb25e8465a25d79f2afc11b1f783399728a8e Mon Sep 17 00:00:00 2001
From: Igor Mandrigin <i@mandrigin.ru>
Date: Mon, 16 Mar 2020 15:25:11 +0300
Subject: [PATCH] post-rebase: remove file

---
 to-merge.txt | 109 ---------------------------------------------------
 1 file changed, 109 deletions(-)
 delete mode 100644 to-merge.txt

diff --git a/to-merge.txt b/to-merge.txt
deleted file mode 100644
index 0f807d1903..0000000000
--- a/to-merge.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-commit b6f1c8dcc058a936955eb8e5766e2962218924bc
-Author: PÃ©ter SzilÃ¡gyi <peterke@gmail.com>
-Date:   Mon Mar 16 13:39:04 2020 +0200
-
-    params: release Geth v1.9.12
-
-commit 97243f3a7657a302dca45910429b9b6d198259f4
-Author: winsvega <dimitry@ethereum.org>
-Date:   Mon Mar 16 12:33:32 2020 +0300
-
-    geth retesteth: increase retesteth default http timeouts (#20767)
-
-commit 241b28369013e72a1fcf5c0a38578a0dbbdb6c89
-Merge: 68b4b7468 466b00913
-Author: PÃ©ter SzilÃ¡gyi <peterke@gmail.com>
-Date:   Sat Mar 14 14:23:58 2020 +0200
-
-    Merge pull request #20747 from karalabe/update-crypto-deps
-    
-    go.mod: update golang.org/x/crypto to fix a Go 1.14 race rejection
-
-commit 466b009135dccde9e1358dbc15057c84b28b1e81
-Author: PÃ©ter SzilÃ¡gyi <peterke@gmail.com>
-Date:   Fri Mar 6 17:14:47 2020 +0200
-
-    go.mod: update golang.org/x/crypto to fix a Go 1.14 race rejection
-
-commit 68b4b74682dd7b81ab921666d0e3eed56cdc838c
-Merge: 92f3405da 270fbfba4
-Author: PÃ©ter SzilÃ¡gyi <peterke@gmail.com>
-Date:   Sat Mar 14 13:52:46 2020 +0200
-
-    Merge pull request #20762 from karalabe/fix-txprop-leak
-    
-    eth: fix transaction announce/broadcast goroutine leak
-
-commit 270fbfba4bb4e0fe91ad2bb3a64cd4aa34da4c5f
-Author: PÃ©ter SzilÃ¡gyi <peterke@gmail.com>
-Date:   Fri Mar 13 23:47:15 2020 +0200
-
-    eth: fix transaction announce/broadcast goroutine leak
-
-commit 92f3405daebe2f2bc8962c565bbb89616e1b30e3
-Author: gary rong <garyrong0905@gmail.com>
-Date:   Thu Mar 12 18:25:52 2020 +0800
-
-    eth, les: fix time sensitive unit tests (#20741)
-
-commit b1efff659e82a1f137a4b70fcd2a67c09237cef5
-Author: Felix Lange <fjl@twurst.com>
-Date:   Thu Mar 12 11:24:36 2020 +0100
-
-    rpc: improve cancel test (#20752)
-    
-    This is supposed to fix the occasional failures in
-    TestCancel* on Travis CI.
-
-commit 0bdb21f0cb9fe73a02b61aeedbbae5b57fc337ae
-Author: meowsbits <45600330+meowsbits@users.noreply.github.com>
-Date:   Tue Mar 10 04:55:27 2020 -0500
-
-    tests: update tests/testdata@develop, include EIP2384 config (#20746)
-    
-    Includes difficulty tests for EIP2384 aka MuirGlacier.
-
-commit 556888c4a971d4fd02be15f09cba7a65c5c0d930
-Author: Ali Atiia <42751398+aliatiia@users.noreply.github.com>
-Date:   Mon Mar 2 12:20:27 2020 -0500
-
-    core/vm: fix method doc (#20730)
-    
-    typo in func name in the comment
-
-commit 01d92531ee0993c0e6e5efe877a1242bfd808626
-Author: rene <41963722+renaynay@users.noreply.github.com>
-Date:   Fri Feb 28 14:43:04 2020 +0100
-
-     rpc: correct typo and reword comment for consistency (#20728)
-
-commit 1e1b18637e83991d3fe7ec048ef22174e75c5bd4
-Author: Felix Lange <fjl@twurst.com>
-Date:   Thu Feb 27 13:10:28 2020 +0100
-
-    p2p/discv5: fix test on go 1.14 (#20724)
-
-commit f1a7997af38bb992d1a75c49ceb952117d3548ec
-Author: Adam Schmideg <adamschmideg@users.noreply.github.com>
-Date:   Thu Feb 27 12:59:00 2020 +0100
-
-    crypto/bn256: fix import line (#20723)
-
-commit cec1f292f0ba6fe5c0ebce505cec69c0efc86d4d
-Author: Felix Lange <fjl@twurst.com>
-Date:   Thu Feb 27 11:16:51 2020 +0100
-
-    mobile: add CallOpts.SetFrom (#20721)
-    
-    This was missing because I forgot to wrap it when bind.CallOpts.From
-    as added.
-
-commit 4fabd9cbd2b8fc6bdc643fefb5ea583c5019171c
-Author: gary rong <garyrong0905@gmail.com>
-Date:   Wed Feb 26 17:41:24 2020 +0800
-
-    les: separate peer into clientPeer and serverPeer (#19991)
-    
-    * les: separate peer into clientPeer and serverPeer
-    
-    * les: address comments
\ No newline at end of file
-- 
GitLab