Merge

ris-tlp · Feb 29, 2024 · 52cc3bd · 52cc3bd
1 parent b67ce1e
commit 52cc3bd
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/infrastructure/rds.tf b/infrastructure/rds.tf
@@ -18,11 +18,5 @@ resource "aws_db_instance" "rds_instance" {
   publicly_accessible    = true
   skip_final_snapshot    = true
   vpc_security_group_ids = [aws_security_group.rds_security_group.id]
-<<<<<<< Updated upstream
 }
-=======
-  db_subnet_group_name   = aws_db_subnet_group.rds_subnet_group.name
 
-}
-
->>>>>>> Stashed changes