Fix another bad merge

oracle · Apr 11, 2017 · 2457323 · 2457323
1 parent 90902d6
commit 2457323
Showing 1 changed file with 1 addition and 10 deletions.
diff --git a/core/subnet_resource.go b/core/subnet_resource.go
@@ -55,22 +55,13 @@ func SubnetResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-<<<<<<< HEAD
-			"dns_label": {
-				Type:     schema.TypeString,
-				Optional: true,
-				Computed: true,
-			},
-			"dhcp_options_id": {
-				Type: schema.TypeString,
-=======
+
 			"dhcp_options_id": {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
 			"dns_label": {
 				Type:     schema.TypeString,
->>>>>>> 61edbd6db31bd1392a23f52271f2f8057dc74e8f
 				Optional: true,
 			},
 			"id": {