Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonyalaribe
tonyalaribe committed Nov 15, 2022
1 parent 230ad3d commit 46d12ca
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions parachains/runtimes/assets/statemine/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,7 @@ sp-session = { git = "https://github.com/paritytech/substrate", default-features
sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-transaction-pool = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
sp-version = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master" }
<<<<<<< HEAD
pallet-state-trie-migration = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "master", optional = true }
=======
>>>>>>> f5fc87a8f (revert to master)

# Polkadot
kusama-runtime-constants = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "master" }
Expand Down

0 comments on commit 46d12ca

Please sign in to comment.