From ab01b1e020e9d6f59a5d316da873915146fb5356 Mon Sep 17 00:00:00 2001 From: Christopher Franko Date: Sun, 26 Mar 2017 12:11:04 -0400 Subject: [PATCH] upstream merge continued - straggling conflict closure --- tests/util.go | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/util.go b/tests/util.go index 4f7672e41f..c9dc84c800 100644 --- a/tests/util.go +++ b/tests/util.go @@ -33,7 +33,6 @@ import ( "github.com/expanse-org/go-expanse/ethdb" "github.com/expanse-org/go-expanse/log" "github.com/expanse-org/go-expanse/params" ->>>>>>> refs/remotes/ethereum/master ) var (