1 files changed, 0 insertions, 1 deletions

diff --git a/statuscake/provider.go b/statuscake/provider.go
index bba03fc..364fe6b 100644
--- 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,