From 1813b80b8acf3a419109890b844406ab18d6976e Mon Sep 17 00:00:00 2001 From: Frh Date: Fri, 12 Jun 2020 17:12:24 -0700 Subject: [PATCH] Merge fix --- tests/test_common.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tests/test_common.py b/tests/test_common.py index 31d3681..bd6c861 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -33,17 +33,11 @@ def test_password(): filename = os.path.join(testdir, "health_protected.pdf") tables = camelot.read_pdf(filename, password="ownerpass", flavor="stream") -<<<<<<< HEAD - assert_frame_equal(df, tables[0].df) - - tables = camelot.read_pdf(filename, password="userpass", flavor="stream") -======= assert len(tables) == 1 assert_frame_equal(df, tables[0].df) tables = camelot.read_pdf(filename, password="userpass", flavor="stream") assert len(tables) == 1 ->>>>>>> Fix unit tests, lint, drop Python 2 support assert_frame_equal(df, tables[0].df)