fixing bad rebase
License: MIT Signed-off-by: Michael Pfister <pfista@gmail.com>
Michael Pfister committed
Jun 3, 2016 at 13:20 UTC
7517bb393b3d24c6ba42df96012eb493cfb7a75b
1 file changed
+7
-4
core/commands/repo.go
+7
-4
@@ -6,8 +6,8 @@ import (
6
cmds "github.com/ipfs/go-ipfs/commands"
7
corerepo "github.com/ipfs/go-ipfs/core/corerepo"
8
config "github.com/ipfs/go-ipfs/repo/config"
9
- lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock"
9
fsrepo "github.com/ipfs/go-ipfs/repo/fsrepo"
10
+ lockfile "github.com/ipfs/go-ipfs/repo/fsrepo/lock"
11
u "gx/ipfs/QmZNVWh8LLjAavuQ2JXuFmuYH3C11xo988vSgp7UQrTRj1/go-ipfs-util"
12
"io"
13
"os"
@@ -27,9 +27,9 @@ var RepoCmd = &cmds.Command{
27
},
28
29
Subcommands: map[string]*cmds.Command{
30
- "gc": repoGcCmd,
31
- "stat": repoStatCmd,
32
- "fsck": RepoFsckCmd,
30
+ "gc": repoGcCmd,
31
+ "stat": repoStatCmd,
32
+ "fsck": RepoFsckCmd,
33
"version": repoVersionCmd,
34
},
35
}
@@ -214,6 +214,9 @@ daemons are running.
214
Type: MessageOutput{},
215
Marshalers: cmds.MarshalerMap{
216
cmds.Text: MessageTextMarshaler,
217
+ },
218
+}
219
+
220
var repoVersionCmd = &cmds.Command{
221
Helptext: cmds.HelpText{
222
Tagline: "Show the repo version.",