Skip to content
This repository was archived by the owner on Feb 3, 2025. It is now read-only.

Commit af64ffa

Browse files
author
Michael Chmielewski
committed
Fix merge remnants in README
1 parent d9cc321 commit af64ffa

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

Diff for: README.md

-4
Original file line numberDiff line numberDiff line change
@@ -169,13 +169,9 @@ module "threatstack_aws_integration" {
169169
sns_topic_display_name = string # Defaults to "Threat Stack integration topic."
170170
sqs_queue_name = string # Defaults to "ThreatStackIntegration"
171171
s3_bucket_name = string # Defaults to "threatstack-integration"
172-
<<<<<<< HEAD
173172
s3_bucket_prefix = string # Defaults to "/"
174173
tags = map # Defaults to {} (empty map)
175-
=======
176-
s3_force_destroy = string # Defaults to "/"
177174
}
178-
>>>>>>> master
179175
180176
#...
181177

0 commit comments

Comments
 (0)