Update variables.tf

Author: srirg

network/vcn/variables.tf

@@ -72,8 +72,6 @@ variable "label_prefix" {
 
 variable "compartment_ocid" {}
 
-<<<<<<< HEAD
-=======
 variable "network_compartment_ocid" {}
 
 variable "nat_compartment_ocid" {}
@@ -84,7 +82,6 @@ variable "lb_compartment_ocid" {}
 
 variable "coreservice_compartment_ocid" {}
 
->>>>>>> b3d1d0b... adding support for multiple compartments
 variable "vcn_dns_name" {}
 
 # Security lists