Skip to content

Commit 23a8e47

Browse files
committed
fix: merge conflicts
1 parent 9ce50f9 commit 23a8e47

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

packages/providers/src/lib/chat/maqsam-whatsapp/maqsam-whatsapp.provider.spec.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,20 +92,12 @@ test('should trigger maqsam library correctly with template message with _passth
9292

9393
expect(mockPost).toHaveBeenCalled();
9494
expect(mockPost).toHaveBeenCalledWith('https://api.maqsam.com/v2/whatsapp/messages/send_message', {
95-
<<<<<<< HEAD
96-
=======
97-
params: {
98-
>>>>>>> c48489db31 (Feat/add maqsam chat provider (#3))
9995
RecipientPhone: '+111111111',
10096
TemplateId: '123',
10197
TemplateVariables: {
10298
name: 'John',
10399
company: 'Acme',
104100
},
105-
<<<<<<< HEAD
106-
=======
107-
},
108-
>>>>>>> c48489db31 (Feat/add maqsam chat provider (#3))
109101
});
110102

111103
const token = Buffer.from(`${mockProviderConfig.accessKey}:${mockProviderConfig.accessSecret}`).toString('base64');

0 commit comments

Comments
 (0)