From 8c338df860839bc7d2930a86d2d0fb8254aa9fd6 Mon Sep 17 00:00:00 2001 From: Jeff Wendling Date: Wed, 26 Sep 2018 23:06:45 -0600 Subject: [PATCH] Add very hacky read support --- cmd/influxd/main.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/cmd/influxd/main.go b/cmd/influxd/main.go index c56c815ba2..e8b94df69d 100644 --- a/cmd/influxd/main.go +++ b/cmd/influxd/main.go @@ -36,10 +36,6 @@ import ( "github.com/influxdata/platform/tsdb" _ "github.com/influxdata/platform/tsdb/index/tsi1" _ "github.com/influxdata/platform/tsdb/tsm1" -<<<<<<< HEAD -======= - pzap "github.com/influxdata/platform/zap" ->>>>>>> Add very basic write support "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cobra" "github.com/spf13/viper"