Jack Zampolin 89f5b77550 Fix merge conflict in all.go

2016-01-22 16:51:54 -08:00

..

inputs

Fix merge conflict in all.go

2016-01-22 16:51:54 -08:00

outputs

Change github.com/influxdata to github.com/influxdata

2016-01-22 16:45:31 -08:00