chore: update osmosis fork to v1.0.0 (#510)

dymensionxyz · Feb 21, 2024 · 6d72531 · 6d72531
1 parent d5274be
commit 6d72531
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/go.mod b/go.mod
@@ -212,7 +212,11 @@ replace (
 	github.com/evmos/ethermint => github.com/dymensionxyz/ethermint v0.22.0-dymension-v0.3
 	github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1
 	github.com/osmosis-labs/osmosis/osmomath => github.com/dymensionxyz/osmosis/osmomath v0.0.6-dym-v0.0.1
+<<<<<<< HEAD
 	github.com/osmosis-labs/osmosis/v15 => github.com/dymensionxyz/osmosis/v15 v15.2.0-dymension-v1.1.3-alpha.1
+=======
+	github.com/osmosis-labs/osmosis/v15 => github.com/dymensionxyz/osmosis/v15 v15.2.0-dymension-v1.0.0
+>>>>>>> bb59edf (chore: update osmosis fork to v1.0.0 (#510))
 
 	//  broken goleveldb
 	github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7