merge/rebase fixes

2026-09-20 06:54:41 +00:00 · 2016-01-12 19:39:53 -05:00
parent ee449a94c8
commit 799efb0629
6 changed files with 17 additions and 10 deletions
@@ -43,7 +43,7 @@ type PrivValidator struct {

 	// PrivKey should be empty if a Signer other than the default is being used.
 	PrivKey crypto.PrivKey `json:"priv_key"`
-	Signer
+	Signer  `json:"-"`

 	// For persistence.
 	// Overloaded for testing.