Skip to content

Commit

Permalink
bad merge?
Browse files Browse the repository at this point in the history
  • Loading branch information
corylanou committed Feb 10, 2016
1 parent c24d112 commit bb7d548
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/influxd/run/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
"github.com/influxdata/influxdb/services/udp"
"github.com/influxdata/influxdb/tcp"
"github.com/influxdata/influxdb/tsdb"
client "github.com/influxdb/usage-client/v1"
client "github.com/influxdata/usage-client/v1"
// Initialize the engine packages
_ "github.com/influxdata/influxdb/tsdb/engine"
)
Expand Down

0 comments on commit bb7d548

Please sign in to comment.