fix: config.toml and app.toml overwrites (#8118)

* fix config and app toml overwrites * changelog * more fixes * changelog name * push * push * clean up * reduce diff * comments * print propper * lint * only change the respective lines, rather than the entire file * reduce diff * abstraction * even more abstraction * add in line comments * update config * in line comments * fix overwrite bug * reduce diff (cherry picked from commit abb6ccf) # Conflicts: # CHANGELOG.md
osmosis-labs · Apr 24, 2024 · 16bba7a · 16bba7a
1 parent a31bdc5
commit 16bba7a
Show file tree

Hide file tree

Showing 2 changed files with 207 additions and 95 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -49,6 +49,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### State Compatible
 
 * [#8006](https://github.com/osmosis-labs/osmosis/pull/8006), [#8014](https://github.com/osmosis-labs/osmosis/pull/8014) Speedup many BigDec operations
+<<<<<<< HEAD
+=======
+* [#8030](https://github.com/osmosis-labs/osmosis/pull/8030) Delete legacy behavior where lockups could not unbond at very small block heights on a testnet
+* [#8118](https://github.com/osmosis-labs/osmosis/pull/8118) Config.toml and app.toml overwrite improvements
+>>>>>>> abb6ccf3 (fix: config.toml and app.toml overwrites (#8118))
 
 ## v24.0.1