TER-240: Add timeouts

claranet · Mar 30, 2018 · 47d282d · 47d282d
1 parent fbb719c
commit 47d282d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/ghost/resource_ghost_app.go b/ghost/resource_ghost_app.go
@@ -25,10 +25,13 @@ func resourceGhostApp() *schema.Resource {
 			Delete: schema.DefaultTimeout(1 * time.Minute),
 		},
 
+<<<<<<< b5b67a4bdd44884372717a174bc01713b7521d46
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
 		},
 
+=======
+>>>>>>> TER-240: Add timeouts
 		Schema: map[string]*schema.Schema{
 			"name": {
 				Type:         schema.TypeString,