Fixed Merge conflicts

This commit is contained in:
Rahul Menon 2015-03-04 18:42:10 +05:30
commit bbc9331d0c
1 changed files with 1 additions and 1 deletions

View File

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