File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -52,8 +52,14 @@ version = "=23.0.0-rc.2.1"
5252version = " =23.0.0-rc.2.1"
5353
5454[workspace .dependencies .soroban-sdk ]
55+ <<<<<<< HEAD
5556version = " =23.0.0-rc.2.1"
5657features = [" testutils" ]
58+ =======
59+ version = " =23.0.0-rc.1.1"
60+ git = " https://github.com/stellar/rs-soroban-sdk"
61+ branch = " fix-testutils-incompat"
62+ >>>>>>> 9de81342 (use fixed soroban-sdk from stellar/rs-soroban-sdk#1476)
5763
5864[workspace .dependencies .soroban-env-host ]
5965version = " =23.0.0-rc.2.1"
@@ -62,7 +68,13 @@ version = "=23.0.0-rc.2.1"
6268version = " =23.0.0-rc.2.1"
6369
6470[workspace .dependencies .soroban-ledger-snapshot ]
71+ <<<<<<< HEAD
6572version = " =23.0.0-rc.2.1"
73+ =======
74+ version = " =23.0.0-rc.1.1"
75+ git = " https://github.com/stellar/rs-soroban-sdk"
76+ branch = " fix-testutils-incompat"
77+ >>>>>>> 9de81342 (use fixed soroban-sdk from stellar/rs-soroban-sdk#1476)
6678
6779# Dependencies from the rs-stellar-rpc-client repo:
6880[workspace .dependencies .soroban-rpc ]
You can’t perform that action at this time.
0 commit comments