src/modules/unified-orders/components/InboundFeeDetailManager.test.ts

@@ -246,11 +246,7 @@ describe('InboundFeeDetailManager', () => {
   })
 
   it('refreshes fee rows and the order detail after every successful write', () => {
-<<<<<<< HEAD
     expect(source).toMatch(/async function finishAction\(message: string\) \{\r?\n  await load\(\); emit\('changed'\)/)
-=======
-    expect(source).toMatch(/async function finishAction\(message: string\)\s*\{\s*await load\(\); emit\('changed'\)/)
->>>>>>> a67f6300f8a7a5225657bc9c9be8ee716f97ccf6
     expect(source).toMatch(/createInboundFeeDetail[\s\S]*updateInboundFeeDetail[\s\S]*adjustInboundFeeDetail[\s\S]*await finishAction\(/)
     expect(source).toMatch(/deleteInboundFeeDetail[\s\S]*await finishAction\('费用明细已删除'\)/)
     expect(source).toMatch(/reviewInboundFeeDetail[\s\S]*await finishAction\('费用审核通过'\)/)