From acb354ab33cdb929971e48366f5a35b4f35e34dd Mon Sep 17 00:00:00 2001 From: Guillaume Ballet <gballet@gmail.com> Date: Thu, 10 Sep 2020 13:14:19 +0000 Subject: [PATCH] cmd/geth: print warning when whisper config is present in toml (#21544) * cmd/geth: print warning when whisper config is present in toml * Update cmd/geth/config.go Co-authored-by: Martin Holst Swende <martin@swende.se> # Conflicts: # cmd/geth/config.go --- to-merge.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/to-merge.txt b/to-merge.txt index 60420cb10..992908039 100644 --- a/to-merge.txt +++ b/to-merge.txt @@ -426,12 +426,3 @@ Date: Thu Sep 10 13:14:19 2020 +0000 Co-authored-by: Martin Holst Swende <martin@swende.se> -commit 116763952498d9c1b852fa94542df1b3f03e2812 -Author: Dan Sosedoff <dan.sosedoff@gmail.com> -Date: Thu Sep 10 07:24:21 2020 -0500 - - ethclient: add BlockNumber method (#21500) - - This adds a new client method BlockNumber to fetch the most recent - block number of the chain. -