scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-09-05 16:15:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix rebase issues

Browse source
This commit is contained in:
jaffee 2016-12-19 15:12:56 -06:00
parent c720ddc28e
commit a03ecf92e9
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bench/bench.go
View file

@ -6,8 +6,6 @@ import (
"strconv"
"sync"
"time"
"golang.org/x/sync/errgroup"
)
// Benchmark is an interface to guide the creation of new pilosa benchmarks or

4
cmd/pilosa/main_test.go
View file

@ -386,8 +386,8 @@ func GenerateSetCommands(n int, rand *rand.Rand) []SetCommand {
}
// ParseConfig parses s into a Config.
func ParseConfig(s string) (main.Config, error) {
var c main.Config
func ParseConfig(s string) (pilosa.Config, error) {
var c pilosa.Config
_, err := toml.Decode(s, &c)
return c, err
}