Fixed merge

2014-11-28 21:44:34 +01:00
parent 8cf9ed0ea5 a3559c5e1b
commit 1bce02eff7
11 changed files with 77 additions and 70 deletions
--- a/cmd/ethereum/main.go
+++ b/cmd/ethereum/main.go
@ -21,6 +21,7 @@ import (
 	"fmt"
 	"os"
 	"runtime"
+
 	"github.com/ethereum/go-ethereum/chain/types"
 	"github.com/ethereum/go-ethereum/cmd/utils"
 	"github.com/ethereum/go-ethereum/ethutil"
@ -29,7 +30,7 @@ import (

 const (
 	ClientIdentifier = "Ethereum(G)"
-	Version          = "0.7.5"
+	Version          = "0.7.6"
 )

 var clilogger = logger.NewLogger("CLI")