From 7d7ffd7b6b36fe56012123ced0135d33546605a9 Mon Sep 17 00:00:00 2001
From: Alexandre Garand <alexandre.garand@fretlink.com>
Date: Fri, 9 Aug 2019 11:12:51 +0200
Subject: fix

---
 statuscake/provider.go | 1 -
 1 file changed, 1 deletion(-)

(limited to 'statuscake')

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,
-- 
cgit v1.2.3