From 5bcb5413a9fa76815e63e2e9a6572835f647744b Mon Sep 17 00:00:00 2001
From: Max U <max.untrecht@gmail.com>
Date: Tue, 26 Jun 2018 13:55:40 -0700
Subject: [PATCH] prevent merge conflict

---
 Makefile | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/Makefile b/Makefile
index 99d7a3a39..bd9d467ba 100644
--- a/Makefile
+++ b/Makefile
@@ -92,16 +92,5 @@ docker-image:
 plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
 	ragel -Z -G2 $^ -o $@
 
-static:
-	@echo "Building static linux binary..."
-	@CGO_ENABLED=0 \
-	GOOS=linux \
-	GOARCH=amd64 \
-	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
-
-plugin-%:
-	@echo "Starting dev environment for $${$(@)} input plugin..."
-	@docker-compose -f plugins/inputs/$${$(@)}/dev/docker-compose.yml up
-
 .PHONY: deps telegraf install test test-windows lint vet test-all package clean docker-image fmtcheck uint64 static