mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-02-09 13:30:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
William Banfield
2022-01-18 20:04:58 -05:00
parent b73c5f3d45
commit 24b0075450
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/consensus/state.go
View File

@@ -8,11 +8,7 @@ import (
"io/ioutil"
"os"
"runtime/debug"
<<<<<<< HEAD
=======
"sort"
"sync"
>>>>>>> 0c82ceaa5 (consensus: calculate prevote message delay metric (#7551))
"time"
"github.com/gogo/protobuf/proto"