fix:解决stash冲突

4d0b9420 · wufan · 5b41df7a · 4d0b9420
Commit 4d0b9420 authored Dec 28, 2020 by wufan
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 6 deletions

src/index.html
+1 -6

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
+ * @LastEditTime: 2020-12-28 15:29:29
->>>>>>> Stashed changes
 * @Description: 
 * @Copyright: 杭州杰竞科技有限公司 版权所有
 -->