From a03ecf92e94d7b7df5ffda66464eaea5fe38bc2d Mon Sep 17 00:00:00 2001
From: jaffee <jaffee@umbel.com>
Date: Mon, 19 Dec 2016 15:12:56 -0600
Subject: [PATCH] fix rebase issues

---
 bench/bench.go          | 2 --
 cmd/pilosa/main_test.go | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/bench/bench.go b/bench/bench.go
index 83d078c43..7949ae062 100644
--- a/bench/bench.go
+++ b/bench/bench.go
@@ -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
diff --git a/cmd/pilosa/main_test.go b/cmd/pilosa/main_test.go
index e4969c1e0..1267d44a5 100644
--- a/cmd/pilosa/main_test.go
+++ b/cmd/pilosa/main_test.go
@@ -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
 }