From 6f4497185e5d65f4b2ebcb60a3aa363401b6b828 Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 13 Jan 2026 10:01:27 -0800 Subject: [PATCH] Fix merge conflict --- src/documents/tests/test_bulk_edit.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/documents/tests/test_bulk_edit.py b/src/documents/tests/test_bulk_edit.py index 62ce48de4..b2cb89b8b 100644 --- a/src/documents/tests/test_bulk_edit.py +++ b/src/documents/tests/test_bulk_edit.py @@ -608,7 +608,6 @@ class TestPDFActions(DirectoriesMixin, TestCase): consume_file_args, _ = mock_consume_file.call_args self.assertEqual(consume_file_args[1].title, "B (merged)") self.assertEqual(consume_file_args[1].created, self.doc2.created) - self.assertTrue(consume_file_args[1].skip_asn) self.assertEqual(result, "OK")