update

src/modules/teacher/data/exam/components/ScoreRange.vue

@@ -75,7 +75,6 @@ export default {
   }
 }
 </script>
-<<<<<<< HEAD
 
 <style lang="scss" scoped>
 .score-range-box{
@@ -89,5 +88,3 @@ export default {
   }
 }
 </style>
-=======
->>>>>>> 21fd47ec6e436a323257a3f4bb63e4971b1987b1