Resolve merge conflicts

- Required as per PR hashicorp#21306 - -
jdw88 · Feb 21, 2022 · 1969c7b · 1969c7b
1 parent aaad2f0
commit 1969c7b
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/aws/resource_aws_sagemaker_model.go → internal/service/sagemaker/model.go b/aws/resource_aws_sagemaker_model.go → internal/service/sagemaker/model.go