Merge branch 'master' of github.com:lightningnetwork/lnd

This commit is contained in:
Tadge Dryja 2016-02-03 16:47:56 -08:00
commit 27def9b623

2
lnd.go

@ -7,7 +7,6 @@ import (
"net/http" "net/http"
_ "net/http/pprof" _ "net/http/pprof"
"os" "os"
"time"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
@ -57,7 +56,6 @@ func main() {
os.Exit(1) os.Exit(1)
} }
lnwallet.Unlock(config.PrivatePass, time.Duration(0))
fmt.Println("wallet open") fmt.Println("wallet open")
defer db.Close() defer db.Close()