Fixed conflicts

influxdata · Apr 3, 2017 · d9e36bc · d9e36bc
1 parent bf4e6c5
commit d9e36bc
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/plugins/inputs/docker/docker.go b/plugins/inputs/docker/docker.go
@@ -32,7 +32,7 @@ type Docker struct {
 	Timeout        internal.Duration
 	PerDevice      bool     `toml:"perdevice"`
 	Total          bool     `toml:"total"`
-  GatherEnvironment []string `toml:"gather_environment"`
+  	GatherEnvironment []string `toml:"gather_environment"`
 	LabelInclude   []string `toml:"docker_label_include"`
 	LabelExclude   []string `toml:"docker_label_exclude"`