From a24c2bbe739e933b2bfea02cd685652752cf3062 Mon Sep 17 00:00:00 2001
From: Robert Kelly <robert.l.kelly3@gmail.com>
Date: Wed, 9 May 2018 00:07:03 -0400
Subject: [PATCH] merge bug

---
 Cargo.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7fa7546b85..6cf9607b6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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"