合并本地分支漏掉一个文件

6cb99529 · wangshuo · f58b12bf · 6cb99529
Commit 6cb99529 authored Jun 11, 2019 by wangshuo
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

src/components/my/index.js
+0 -4

No files found.
--- a/src/components/my/index.js
+++ b/src/components/my/index.js
@@ -11,12 +11,8 @@ import { Link } from "react-router-dom";
 const Item = List.Item;
 const Brief = Item.Brief;

-<<<<<<< HEAD
 class My extends PureComponent {

-=======
-class My extends Component {
->>>>>>> dev
    render() {
        let { history } = this.props;
        return (