Fix the conflict, fix formatting
@@ -39,6 +39,8 @@ func Provider() *schema.Provider {
"artifactory_local_docker_v2_repository": local.ResourceArtifactoryLocalDockerV2Repository(),
"artifactory_local_docker_v1_repository": local.ResourceArtifactoryLocalDockerV1Repository(),
"artifactory_local_rpm_repository": local.ResourceArtifactoryLocalRpmRepository(),
+ "artifactory_local_terraform_module_repository": local.ResourceArtifactoryLocalTerraformModuleRepository(),
+ "artifactory_local_terraform_provider_repository": local.ResourceArtifactoryLocalTerraformProviderRepository(),
"artifactory_remote_bower_repository": remote.ResourceArtifactoryRemoteBowerRepository(),
"artifactory_remote_cargo_repository": remote.ResourceArtifactoryRemoteCargoRepository(),
"artifactory_remote_cocoapods_repository": remote.ResourceArtifactoryRemoteCocoapodsRepository(),
@@ -49,6 +51,7 @@ func Provider() *schema.Provider {
"artifactory_remote_maven_repository": remote.ResourceArtifactoryRemoteJavaRepository("maven", false),
"artifactory_remote_nuget_repository": remote.ResourceArtifactoryRemoteNugetRepository(),
"artifactory_remote_pypi_repository": remote.ResourceArtifactoryRemotePypiRepository(),
+ "artifactory_remote_terraform_repository": remote.ResourceArtifactoryRemoteTerraformRepository(),
"artifactory_remote_vcs_repository": remote.ResourceArtifactoryRemoteVcsRepository(),
"artifactory_virtual_alpine_repository": virtual.ResourceArtifactoryVirtualAlpineRepository(),
"artifactory_virtual_bower_repository": virtual.ResourceArtifactoryVirtualBowerRepository(),
