修改冲突

96a63824 · 前端-黄佳鑫 · 9e90f8cf · 96a63824
Commit 96a63824 authored Sep 27, 2020 by 前端-黄佳鑫
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

index.tsx src/pages/transaction/electronicContracts/apply/index.tsx +0 -4

No files found.
--- a/src/pages/transaction/electronicContracts/apply/index.tsx
+++ b/src/pages/transaction/electronicContracts/apply/index.tsx
@@ -63,10 +63,6 @@ const Apply = () => {
        history.push(`/memberCenter/tranactionAbility/electronicContracts/enterpriseCertified?authTypeEdit=${authType}`)
      })
    }
-<<<<<<< HEAD
-=======
-
->>>>>>> 7a88dc8b38dd35b3306fd1b24c0668dd72df2ffd
  }

  return (