split text modify again

src/components/activity/newyear-2019/preheat/YearCourse/index.js

@@ -438,7 +438,7 @@ class YearCourse extends Component {
                 {/*浮框*/}
                 <div className='nav-right'>
                     <span onClick={this.toBoxList} className='nav-right__link'>
-                        未拆宝箱
+                        未开宝箱
                         {
                             removable > 0 &&
                             <i className="nav-right__number">{removable}</i>

src/components/activity/newyear-2019/preheat/index.js

@@ -131,7 +131,6 @@ export default class index extends Component {
                     </div>
                     <div className="banner-treasure__decorate"></div>
                 </div>
-<<<<<<< HEAD
                 {/*浮框*/}
                 <div className='nav-right'>
                     <span onClick={this.toBoxList} className='nav-right__link'>
@@ -149,9 +148,6 @@ export default class index extends Component {
                         }
                     </a>
                 </div>
-=======
-
->>>>>>> c02cc991093653f9baa21a7088ec2362f166285f
                 {/* 大咖直播 */}
                 <LiveRoom/>