fix

diff --git a/statuscake/provider.go b/statuscake/provider.go
index bba03fcd190a6421e682b993f0c6d66251fe04d8..364fe6b653544f90f4e4808222a5650269d35d68 100644 (file)
--- a/statuscake/provider.go
+++ b/statuscake/provider.go
@@ -28,7 +28,6 @@ func Provider() terraform.ResourceProvider {
                        "statuscake_ssl":           resourceStatusCakeSsl(),
                        "statuscake_test":          resourceStatusCakeTest(),
                        "statuscake_contact_group": resourceStatusCakeContactGroup(),
->>>>>>> 0b957cd46a2a3a209c45778da2a7e1e55a94f3c7
                },
 
                ConfigureFunc: providerConfigure,