woops

ceorourke · ceorourke · commit 2691c742019d · 2025-04-04T10:18:08.000-07:00
diff --git a/src/sentry/testutils/factories.py b/src/sentry/testutils/factories.py
@@ -2309,7 +2309,6 @@ def create_action_alert_rule_trigger_action(
 
         return ActionAlertRuleTriggerAction.objects.create(
             action=action, alert_rule_trigger_action_id=alert_rule_trigger_action_id
->>>>>>> b083e1555e3 (clean up tests)
         )
 
     @staticmethod

Original file line number	Diff line number	Diff line change
`@@ -2309,7 +2309,6 @@ def create_action_alert_rule_trigger_action(`
`2309`	`2309`
`2310`	`2310`	`return ActionAlertRuleTriggerAction.objects.create(`
`2311`	`2311`	`action=action, alert_rule_trigger_action_id=alert_rule_trigger_action_id`
`2312`		`->>>>>>> b083e1555e3 (clean up tests)`
`2313`	`2312`	`)`
`2314`	`2313`
`2315`	`2314`	`@staticmethod`