解决冲突

pages/CourseDetails.js

@@ -46,21 +46,5 @@ export default class CourseDetails extends Component {
 }
 
 const styles = StyleSheet.create({
-<<<<<<< HEAD
   
-=======
-  courseList: {
-    width: '100%',
-    backgroundColor: '#fff',
-    marginTop: 8,
-  },
-  padding: {
-    paddingLeft: 20,
-    paddingRight: 20,
-    
-  },
-  title: {
-
-  }
->>>>>>> ea0eb52ce93eb1f6e7dfff98ef67d5808565f154
 });