Update CHANGELOG.md

osmosis-labs · Jun 3, 2024 · b3f605d · b3f605d
1 parent 016c96c
commit b3f605d
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,18 +3,9 @@
 ## Unreleased
 
 * [#83](https://github.com/osmosis-labs/cometbft/pull/83)  perf(types): 3x speedup MakePartSet (#3117)
-<<<<<<< HEAD
-<<<<<<< HEAD
-* [#84](https://github.com/osmosis-labs/cometbft/pull/84)  Comment out expensive debug logs
-=======
-* [#85](https://github.com/osmosis-labs/cometbft/pull/85)  perf(flowrate): Speedup flowrate.Clock (#3016)
->>>>>>> 8a9233c08 (Add changelog)
-
-=======
 * [#85](https://github.com/osmosis-labs/cometbft/pull/85)  perf(flowrate): Speedup flowrate.Clock (#3016)
 * [#86](https://github.com/osmosis-labs/cometbft/pull/86)  Comment out expensive debug logs
 * [#91](https://github.com/osmosis-labs/cometbft/pull/91)  perf(consensus): Minor improvement by making add vote only do one peer set mutex call, not 3 (#3156)
->>>>>>> 76006d581 (Add changelog)
 
 ## v0.37.4-v25-osmo-5