solve conflict 03

src/components/video/video-catalog/index.js

@@ -35,23 +35,11 @@ class VideoCatalog extends Component {
                                     </div>
                                     {
                                         (item.practice && item.practice.qid)
-<<<<<<< HEAD
-                                            ? <Link 
-                                                to={{
-                                                    pathname: item.practice.is_tested ? '/campResolve' : '/campTest',
-                                                    search: `?keshi_id=${item.id}&qid=${item.practice.qid}`,
-                                                    state: {
-                                                        from: `/play/video${window.location.search}`
-                                                    }
-                                                }}
-                                            >
-=======
                                             ? <Link to={{
                                                 pathname: item.practice.is_tested ? '/campResolve' : '/campTest',
                                                 search: `?keshi_id=${item.id}&qid=${item.practice.qid}`,
                                                 state: {from: `/play/video${window.location.search}`}
                                             }}>
->>>>>>> ef91ba3d8a0a94933546e5e626e4683a35469b0d
                                                 <div className="exercise">
                                                     课后练习：{item.practice.title}
                                                     <i className={classnames('iconfont',!item.video_auth ? 'iconiconfront-74' : item.practice.is_tested ? 'iconiconfront-3' : '')}/>