fix:解决stash冲突

dbb8d8d0 · wufan · zhangleyuan · 72b28931 · 72b28931
Commit dbb8d8d0 authored Dec 28, 2020 by wufan Committed by zhangleyuan Jan 08, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 62 deletions

src/index.html
+0 -62

No files found.
--- a/src/index.html
+++ b/src/index.html
-<!--
- * @Author: 吴文洁
- * @Date: 2020-08-24 12:20:57
-<<<<<<< Updated upstream
- * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-24 10:34:16
-=======
- * @LastEditors: wufan
- * @LastEditTime: 2020-12-28 14:04:31
->>>>>>> Stashed changes
- * @Description: 
- * @Copyright: 杭州杰竞科技有限公司 版权所有
-->
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8" />
-    <link rel="icon" href="" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta name="theme-color" content="#000000" />
-    <meta
-      name="description"
-      content="Web site created using create-react-app"
-    />
-    <!-- <link rel="apple-touch-icon" href="../src/common/images/logo.png" /> -->
-    <link rel="shortcut icon" href="https://image.xiaomaiketang.com/xm/KGSYFEpcHT.png">
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
-    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <link rel="stylesheet" href="//at.alicdn.com/t/font_2223403_5k8dbuf925c.css">
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>小麦云课堂</title>
-    <script type="text/javascript" charset="utf-8" src="//g.alicdn.com/sd/ncpc/nc.js?t=2015052012"></script>
-  </head>
-  <body>
-    <noscript>You need to enable JavaScript to run this app.</noscript>
-    <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
-  </body>
-</html>