解决冲突

src/app.tsx

@@ -2,11 +2,6 @@ import { IRoutes } from '.';
 import { history, RequestConfig } from 'umi';
 import React from 'react'
 import MobxProvider from './store'
-<<<<<<< HEAD
-import 'mobx-react-lite/batchingForReactDom'
-import './global.less'
-=======
->>>>>>> 3fcaf2ac8432e3e511d10c3073e59eb1aa99a368
 
 let extraRoutes: never[] = []
 
@@ -100,17 +95,4 @@ export function rootContainer(container: any) {
 //   requestInterceptors: [],
 //   responseInterceptors: []
 // }
-<<<<<<< HEAD
-=======
 
-
-/**
- * @description 初始化配置数据 https://umijs.org/zh-CN/plugins/plugin-initial-state#%E4%BB%8B%E7%BB%8D
- * @author xjm
- * @date 2020-06-10
- * @export
- */
-// export async function getInitialState():Promise<{menu: {title: string, logo: string}}> {
-//   return globalConfig
-// }
->>>>>>> 3fcaf2ac8432e3e511d10c3073e59eb1aa99a368

src/global.less

-@import '~@/styles/theme.less';
-
-// antd default
-h1, h2, h3, h4, h5, h6 {
-  color: #6B778C;
-}
-.@{prefix}-margin_content {
-  width: 1190px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-.@{prefix}-content1024 {
-  width: 1024px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-
-// 公共的title伪类竖线
-.commonPanelTitle {
-  padding-left: 8px;
-  position: relative;
-  &::before {
-    content: "";
-    display: inline-block;
-    position: absolute;
-    left: 0;
-    top: 50%;
-    margin-top: -.42667rem;
-    width: 2px;
-    height: .85333rem;
-    background-color: #00B37A;
-    box-shadow: 0 0.14933rem 0.256rem 0 rgba(97,144,232,.2);
-    border-radius: 1px;
-  }
-}
-
-
-// 公共间隔
-.mr-10{
-  margin-right: 10px;
-}
-.mr-20{
-  margin-right: 20px;
-}
-.mr-30{
-  margin-right: 30px;
-}
-.mr-50{
-  margin-right: 50px;
-}
-.mr-100{
-  margin-right: 100px;
-}
-.ml-10{
-  margin-left: 10px;
-}
-.ml-20{
-  margin-left: 20px;
-}
-.ml-30{
-  margin-left: 30px;
-}
-.ml-50{
-  margin-left: 50px;
-}
-.ml-100{
-  margin-left: 100px;
-}
-.mt-10{
-  margin-top: 10px;
-}
-.mt-20{
-  margin-top: 20px;
-}
-.mt-30{
-  margin-top: 30px;
-}
-.mt-50{
-  margin-top: 50px;
-}
-.mt-100{
-  margin-top: 100px;
-}
-.mb-10{
-  margin-bottom: 10px;
-}
-.mb-20{
-  margin-bottom: 20px;
-}
-.mb-30{
-  margin-bottom: 30px;
-}
-.mb-50{
-  margin-bottom: 50px;
-}
-.mb-100{
-  margin-bottom: 100px;
-}

src/global.less.d.ts

-// This file is automatically generated.
-// Please do not change this file!
-interface CssExports {
-  'commonPanelTitle': string;
-  'lingxi-business-content1024': string;
-  'lingxi-business-margin_content': string;
-  'lingxiBusinessContent1024': string;
-  'lingxiBusinessMarginContent': string;
-  'mb-10': string;
-  'mb-100': string;
-  'mb-20': string;
-  'mb-30': string;
-  'mb-50': string;
-  'mb10': string;
-  'mb100': string;
-  'mb20': string;
-  'mb30': string;
-  'mb50': string;
-  'ml-10': string;
-  'ml-100': string;
-  'ml-20': string;
-  'ml-30': string;
-  'ml-50': string;
-  'ml10': string;
-  'ml100': string;
-  'ml20': string;
-  'ml30': string;
-  'ml50': string;
-  'mr-10': string;
-  'mr-100': string;
-  'mr-20': string;
-  'mr-30': string;
-  'mr-50': string;
-  'mr10': string;
-  'mr100': string;
-  'mr20': string;
-  'mr30': string;
-  'mr50': string;
-  'mt-10': string;
-  'mt-100': string;
-  'mt-20': string;
-  'mt-30': string;
-  'mt-50': string;
-  'mt10': string;
-  'mt100': string;
-  'mt20': string;
-  'mt30': string;
-  'mt50': string;
-}
-export const cssExports: CssExports;
-export default cssExports;

src/pages/user/index.less

@@ -189,7 +189,6 @@
     margin: 0 auto;
   }
 }
-=======
 .agreement {
   font-size: 12px;
 }
@@ -229,4 +228,4 @@
   margin-right: auto;
   display: block;
 }
->>>>>>> 3fcaf2ac8432e3e511d10c3073e59eb1aa99a368
+}
\ No newline at end of file