Skip to content

Commit ab32399

Browse files
CCM-11026: Fix after bad rebase
1 parent 909fbe9 commit ab32399

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

lambdas/backend-api/src/__tests__/templates/domain/template-pdf.test.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,11 @@ test('parse with custom personalisation', async () => {
7272
path.resolve(__dirname, '../fixtures/custom-personalisation.pdf')
7373
);
7474
const pdf = new TemplatePdf(
75-
<<<<<<< HEAD
7675
{
7776
templateId: 'template-id',
7877
clientId: 'template-owner',
7978
},
8079
file
81-
=======
82-
{ id: 'template-id', owner: 'template-owner' },
83-
new Uint8Array(file)
84-
>>>>>>> 1184641e (CCM-11026: test revert package lock)
8580
);
8681
await pdf.parse();
8782

0 commit comments

Comments
 (0)