solve conflict

src/components/video/camp/campTest.js

@@ -71,7 +71,6 @@ class CampTest extends Component {
             this.body = document.getElementsByTagName('body')[0];
             this.body.style.position = 'static';
         } else {
-<<<<<<< HEAD
             const { history, location: { state={} } } = this.props;
             let to = '';
             if(state.from && state.from.indexOf('video') !== -1) {
@@ -87,9 +86,6 @@ class CampTest extends Component {
                     to
                 }
             );
-=======
-            this.props.history.push(`${this.props.location.state.from}`,{href: '/classify'})
->>>>>>> ef91ba3d8a0a94933546e5e626e4683a35469b0d
         }
     };
     // 选择答案