From 99033c6c572eff51587ea174daadbcbb38bfc30d Mon Sep 17 00:00:00 2001
From: gary rong <garyrong0905@gmail.com>
Date: Wed, 23 Sep 2020 15:59:11 +0800
Subject: [PATCH] trie: fix gaped range proof test case (#21484)

# Conflicts:
#	trie/proof_test.go
---
 to-merge.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/to-merge.txt b/to-merge.txt
index 05938753e..9b960d215 100644
--- a/to-merge.txt
+++ b/to-merge.txt
@@ -97,9 +97,3 @@ Date:   Wed Sep 23 15:59:11 2020 +0800
 
     trie: fix gaped range proof test case (#21484)
 
-commit fdb742419e6ff8373e57bdf99836c22f689b0e55
-Author: Binacs <bin646891055@gmail.com>
-Date:   Wed Sep 23 05:22:54 2020 +0800
-
-    cmd/clef, cmd/geth: use SplitAndTrim from cmd/utils (#21579)
-