fix straggling line

PostHog · May 22, 2024 · 0d48fce · 0d48fce
1 parent 449e0b7
commit 0d48fce
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/posthog/models/test/__snapshots__/test_async_deletion_model.ambr b/posthog/models/test/__snapshots__/test_async_deletion_model.ambr
@@ -321,7 +321,6 @@
   FROM events
   WHERE (team_id = 2
          AND $group_0 = 'foo')
->>>>>>> parent of b28e44cca4 (fix: Fix deletion job by using join tables (#21323))
   '''
 # ---
 # name: TestAsyncDeletion.test_mark_deletions_done_person