Resolving merge conflicts

Andyg79 · Andyg79 · commit afa0604bd566 · 2025-06-12T08:52:55.000+01:00
diff --git a/tests/regression/call_and_recall/test_generate_fobt_invitation_regression.py b/tests/regression/call_and_recall/test_generate_fobt_invitation_regression.py
@@ -12,6 +12,7 @@
     ManageActiveBatchPage,
 )
 from utils.user_tools import UserTools
+from utils.batch_processing import prepare_and_print_batch
 
 
 @pytest.fixture(scope="function", autouse=True)

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`ManageActiveBatchPage,`
`13`	`13`	`)`
`14`	`14`	`from utils.user_tools import UserTools`
	`15`	`+from utils.batch_processing import prepare_and_print_batch`
`15`	`16`
`16`	`17`
`17`	`18`	`@pytest.fixture(scope="function", autouse=True)`