Commits on Jun 24, 2024

1. build(deps): bump github.com/Finschia/ostracon from 1.1.3 to 1.1.5 (#392 …

   )
   
   * build(deps): bump github.com/Finschia/ostracon from 1.1.3 to 1.1.5
   
   Bumps [github.com/Finschia/ostracon](https://github.com/Finschia/ostracon) from 1.1.3 to 1.1.5.
   - [Release notes](https://github.com/Finschia/ostracon/releases)
   - [Changelog](https://github.com/Finschia/ostracon/blob/main/CHANGELOG.md)
   - [Commits](Finschia/ostracon@v1.1.3...v1.1.5)
   
   ---
   updated-dependencies:
   - dependency-name: github.com/Finschia/ostracon
     dependency-type: direct:production
     update-type: version-update:semver-patch
   ...
   
   Signed-off-by: dependabot[bot] <support@github.com>
   
   * chore: modify subnet of localnet for docker-compose.yml
   
   Signed-off-by: zemyblue <zemyblue@gmail.com>
   
   ---------
   
   Signed-off-by: dependabot[bot] <support@github.com>
   Signed-off-by: zemyblue <zemyblue@gmail.com>
   Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
   Co-authored-by: zemyblue <zemyblue@gmail.com>
   Co-authored-by: Jaeseung Lee <41176085+tkxkd0159@users.noreply.github.com>
   (cherry picked from commit f747c3c)
   
   # Conflicts:
   #	go.mod
   #	go.sum

   

   dependabot[bot] authored and mergify[bot] committed Jun 24, 2024
   Configuration menu

   • View commit details
   • Copy full SHA for 5ac2e8c
   • Browse repository at this point

   Copy the full SHA

   5ac2e8c View commit details

   Browse the repository at this point in the history

2. fix: conflict …

   Signed-off-by: zemyblue <zemyblue@gmail.com>

   

   zemyblue committed Jun 24, 2024
   Configuration menu

   • View commit details
   • Copy full SHA for aec0cb1
   • Browse repository at this point

   Copy the full SHA

   aec0cb1 View commit details

   Browse the repository at this point in the history