From c8a2d40c82a93d702429d3ddb103befe6bd3e221 Mon Sep 17 00:00:00 2001 From: stack72 Date: Thu, 2 Feb 2017 10:30:41 +0000 Subject: [PATCH] provider/aws: Fixing a merge conflict issue in validators.go --- builtin/providers/aws/validators.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/builtin/providers/aws/validators.go b/builtin/providers/aws/validators.go index f55c9549d..526505bc9 100644 --- a/builtin/providers/aws/validators.go +++ b/builtin/providers/aws/validators.go @@ -863,6 +863,9 @@ func validateDmsReplicationTaskId(v interface{}, k string) (ws []string, es []er es = append(es, fmt.Errorf("%q must not end in a hyphen", k)) } + return +} + func validateAppautoscalingScalableDimension(v interface{}, k string) (ws []string, errors []error) { value := v.(string) dimensions := map[string]bool{