resolve merge conflicts

ooni · Oct 3, 2024 · 58910f7 · 58910f7
1 parent ef4fc50
commit 58910f7
Showing 1 changed file with 0 additions and 20 deletions.
diff --git a/tf/modules/ooniapi_frontend/main.tf b/tf/modules/ooniapi_frontend/main.tf
@@ -187,29 +187,9 @@ resource "aws_lb_listener_rule" "ooniapi_oonifindings_rule" {
   }
 }
 
-<<<<<<< HEAD
-resource "aws_lb_listener_rule" "ooniapi_oonifindings_rule" {
-  listener_arn = aws_alb_listener.ooniapi_listener_https.arn
-  priority     = 103
-
-  action {
-    type             = "forward"
-    target_group_arn = var.ooniapi_measurements_target_group_arn
-  }
-
-  condition {
-    path_pattern {
-      values = ["/api/v1/incidents/*"]
-    }
-  }
-}
-
-## DNS
-=======
 resource "aws_lb_listener_rule" "ooniapi_oonifindings_rule_host" {
   listener_arn = aws_alb_listener.ooniapi_listener_https.arn
   priority     = 131
->>>>>>> main
 
   action {
     type             = "forward"