Skip to content

Commit

Permalink
Merge branch 'master' into staging-client
Browse files Browse the repository at this point in the history
  • Loading branch information
rod-hynes committed Jun 29, 2019
2 parents 395d950 + b6d6f21 commit 2664f1a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions psiphon/common/protocol/serverEntry.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,11 +134,11 @@ func (fields ServerEntryFields) GetConfigurationVersion() int {
if !ok {
return 0
}
configurationVersionInt, ok := configurationVersion.(int)
configurationVersionFloat, ok := configurationVersion.(float64)
if !ok {
return 0
}
return configurationVersionInt
return int(configurationVersionFloat)
}

func (fields ServerEntryFields) GetLocalSource() string {
Expand Down

0 comments on commit 2664f1a

Please sign in to comment.