fix merge conflicts

atomone-hub · Jan 14, 2025 · 2713498 · 2713498
1 parent 3d4fc3f
commit 2713498
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/go.mod b/go.mod
@@ -37,6 +37,7 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
 	google.golang.org/grpc v1.67.0
 	google.golang.org/protobuf v1.34.2
+	gopkg.in/yaml.v2 v2.4.0
 	gotest.tools/v3 v3.5.1
 	sigs.k8s.io/yaml v1.4.0
 )

diff --git a/x/gov/types/v1/params.go b/x/gov/types/v1/params.go
@@ -12,7 +12,6 @@ import (
 // Default period for deposits & voting and min voting period
 const (
 	DefaultVotingPeriod               time.Duration = time.Hour * 24 * 21 // 21 days
-	MinVotingPeriod                   time.Duration = time.Hour * 24 * 21 // 21 days
 	DefaultDepositPeriod              time.Duration = time.Hour * 24 * 14 // 14 days
 	DefaultGovernorStatusChangePeriod time.Duration = time.Hour * 24 * 28 // 28 days
 )