From ceddabdf24452749257fd0359ba6bda090253b8b Mon Sep 17 00:00:00 2001
From: Melvin Junhee Woo <melvin.woo@groundx.xyz>
Date: Mon, 25 Jan 2021 22:25:55 +0900
Subject: [PATCH] snapshot: merge loops for better performance (#22160)

# Conflicts:
#	core/state/snapshot/difflayer.go
---
 diff.txt | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/diff.txt b/diff.txt
index 5ea27d0d2..c19c282e0 100644
--- a/diff.txt
+++ b/diff.txt
@@ -1229,11 +1229,3 @@ Author: Melvin Junhee Woo <melvin.woo@groundx.xyz>
 Date:   Mon Jan 25 22:25:55 2021 +0900
 
     snapshot: merge loops for better performance (#22160)
-
-commit 59a79137b9c8740a3623cdf35512e1eb49c8a20b
-Author: ucwong <ucwong@126.com>
-Date:   Mon Jan 25 19:46:09 2021 +0800
-
-    go.mod: upgrade github.com/huin/goupnp (#22227)
-    
-    This updates the goupnp dependency, fixing huin/goupnp#33