solve conflict

src/components/detail/index.js

@@ -579,12 +579,7 @@ class Detail extends Component {
                         <ShareRank courseInfo={course_info}/>
                     }
 
-<<<<<<< HEAD
-                    {
-                    /**
-=======
                     {/**
->>>>>>> 3d5db90ae5dc465dc6afedc3741fb67d7d7e3f0b
                      * 拼团
                      * is_aist: 是否AI特训营
                      * group_status: 团状态，3：课程有小团 用户没参加小团；4：用户参加了小团
@@ -599,12 +594,6 @@ class Detail extends Component {
                             invitedFriends={this.invitedFriends}
                         />
                     }
-<<<<<<< HEAD
-                
-
-                
-=======
->>>>>>> 3d5db90ae5dc465dc6afedc3741fb67d7d7e3f0b
 
                     {/*砍价*/}
                     {