Fixed Merge conflicts

This commit is contained in:
Rahul Menon
2015-03-04 18:42:10 +05:30

View File

@@ -58,7 +58,7 @@ func resourceAwsVpc() *schema.Resource {
Computed: true,
},
"tags": tagsSchema(),
// "tags": tagsSchema(),
},
}
}