merge bug
This commit is contained in:
parent
bdbe90b891
commit
a24c2bbe73
|
@ -1,11 +1,7 @@
|
|||
[package]
|
||||
name = "solana"
|
||||
description = "High Performance Blockchain"
|
||||
<<<<<<< HEAD
|
||||
version = "0.5.0-beta"
|
||||
=======
|
||||
version = "0.5.0"
|
||||
>>>>>>> 3236be7877143563faf35255a599cb944603d0f3
|
||||
documentation = "https://docs.rs/solana"
|
||||
homepage = "http://solana.io/"
|
||||
repository = "https://github.com/solana-labs/solana"
|
||||
|
|
Loading…
Reference in New Issue