fix: fix conflict

push-protocol · Nov 15, 2023 · 5dd8bbc · 5dd8bbc
1 parent fae8686
commit 5dd8bbc
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/packages/restapi/tests/lib/channel/subscribeV2.test.ts b/packages/restapi/tests/lib/channel/subscribeV2.test.ts
@@ -46,15 +46,9 @@ describe('PUSH_CHANNEL.subscribeV2 functionality', () => {
   it('Should subscribe to the channel via V2 with settings', async () => {
     const res = await PUSH_CHANNEL.subscribeV2({
       signer: signer1,
-<<<<<<< HEAD
-      channelAddress: 'eip155:11155111:0xD8634C39BBFd4033c0d3289C4515275102423681',
-      userAddress: `eip155:11155111:${account1}`,
-      env: Constants.ENV.STAGING,
-=======
       channelAddress: 'eip155:5:0xD8634C39BBFd4033c0d3289C4515275102423681',
       userAddress: `eip155:5:${account1}`,
       env: CONSTANTS.ENV.STAGING,
->>>>>>> 7d9912ccb94cc0b77398d28b895ece7d91c46e6a
       userSetting: '2-1-0+2-1',
     });
     expect(res.status).to.be.equal('success');