- fixing up the merge conflict

This commit is contained in:
Rohith 2019-01-19 09:49:35 +00:00
parent 16b19f804c
commit 132e58b0d7
1 changed files with 1 additions and 1 deletions

View File

@ -23,7 +23,7 @@ go_library(
"//upup/pkg/fi:go_default_library",
"//upup/pkg/fi/cloudup/awsup:go_default_library",
"//util/pkg/slice:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/arn:go_default_library",
"//vendor/github.com/aws/aws-sdk-go/aws/arn:go_default_library",
"//vendor/github.com/blang/semver:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/validation:go_default_library",