From 58910f738ca55023e8ab2070476d4f13cf541f84 Mon Sep 17 00:00:00 2001
From: decfox <mehul@openobservatory.org>
Date: Thu, 3 Oct 2024 12:54:23 +0530
Subject: [PATCH] resolve merge conflicts

---
 tf/modules/ooniapi_frontend/main.tf | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/tf/modules/ooniapi_frontend/main.tf b/tf/modules/ooniapi_frontend/main.tf
index 611e985a..c72937a2 100644
--- 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"