fix conflict

anmolnagpal · anmolnagpal · commit 2f7b3b9b4e60 · 2021-06-22T23:15:56.000+05:30
diff --git a/variables.tf b/variables.tf
@@ -160,15 +160,12 @@ variable "iops" {
   description = "The baseline input/output (I/O) performance of EBS volumes attached to data nodes. Applicable only for the Provisioned IOPS EBS volume type."
 }
 
-<<<<<<< HEAD
 variable "encrypt_at_rest_enabled" {
   type        = bool
   default     = true
   description = "Whether to enable encryption at rest."
 }
 
-=======
->>>>>>> 8d63f311f29373c52b08cd8d486469ad0b5f518d
 variable "kms_key_id" {
   type        = string
   default     = ""

Original file line number	Diff line number	Diff line change
`@@ -160,15 +160,12 @@ variable "iops" {`
`160`	`160`	`description = "The baseline input/output (I/O) performance of EBS volumes attached to data nodes. Applicable only for the Provisioned IOPS EBS volume type."`
`161`	`161`	`}`
`162`	`162`
`163`		`-<<<<<<< HEAD`
`164`	`163`	`variable "encrypt_at_rest_enabled" {`
`165`	`164`	`type = bool`
`166`	`165`	`default = true`
`167`	`166`	`description = "Whether to enable encryption at rest."`
`168`	`167`	`}`
`169`	`168`
`170`		`-=======`
`171`		`->>>>>>> 8d63f311f29373c52b08cd8d486469ad0b5f518d`
`172`	`169`	`variable "kms_key_id" {`
`173`	`170`	`type = string`
`174`	`171`	`default = ""`