gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merge bug

Browse Source
This commit is contained in:
Robert Kelly
2018-05-09 00:07:03 -04:00
parent bdbe90b891
commit a24c2bbe73
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.toml
View File

@ -1,11 +1,7 @@
[package] [package]
name = "solana" name = "solana"
description = "High Performance Blockchain" description = "High Performance Blockchain"
<<<<<<< HEAD
version = "0.5.0-beta"
=======
version = "0.5.0" version = "0.5.0"
>>>>>>> 3236be7877143563faf35255a599cb944603d0f3
documentation = "https://docs.rs/solana" documentation = "https://docs.rs/solana"
homepage = "http://solana.io/" homepage = "http://solana.io/"
repository = "https://github.com/solana-labs/solana" repository = "https://github.com/solana-labs/solana"