Fix: imports order (elastic#16207)

kvch · Feb 20, 2020 · cad95d7 · cad95d7
1 parent 61e20bd
commit cad95d7
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go b/x-pack/libbeat/autodiscover/providers/aws/ec2/provider_test.go
@@ -5,30 +5,19 @@
 package ec2
 
 import (
+ "errors"
  "testing"
  "time"
 
-<<<<<<< HEAD
-=======
+ "github.com/gofrs/uuid"
+ "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
+
  "github.com/elastic/beats/v7/libbeat/common"
  "github.com/elastic/beats/v7/libbeat/common/bus"
  "github.com/elastic/beats/v7/libbeat/logp"
  awsauto "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws"
  "github.com/elastic/beats/v7/x-pack/libbeat/autodiscover/providers/aws/test"
->>>>>>> Add autodiscover for aws_ec2 (#14823)
- "github.com/gofrs/uuid"
- "github.com/pkg/errors"
- "github.com/stretchr/testify/assert"
- "github.com/stretchr/testify/require"
-<<<<<<< HEAD
-
- "github.com/elastic/beats/v7/v7/libbeat/common"
- "github.com/elastic/beats/v7/v7/libbeat/common/bus"
- "github.com/elastic/beats/v7/v7/libbeat/logp"
- awsauto "github.com/elastic/beats/v7/v7/x-pack/libbeat/autodiscover/providers/aws"
- "github.com/elastic/beats/v7/v7/x-pack/libbeat/autodiscover/providers/aws/test"
-=======
->>>>>>> Add autodiscover for aws_ec2 (#14823)
 )
 
 func Test_internalBuilder(t *testing.T) {