Fixed Merge conflicts

2015-03-04 18:42:10 +05:30 · 2015-03-04 18:42:10 +05:30 · bbc9331d0c
parent 840e6f4826 d56c683602
commit bbc9331d0c
1 changed files with 1 additions and 1 deletions
--- a/builtin/providers/aws/resource_aws_vpc.go
+++ b/builtin/providers/aws/resource_aws_vpc.go
@ -58,7 +58,7 @@ func resourceAwsVpc() *schema.Resource {
 				Computed: true,
 			},

-			"tags": tagsSchema(),
+			//			"tags": tagsSchema(),
 		},
 	}
 }