diff --git a/src/view/overview.vue b/src/view/overview.vue
index e4ddffa..53d6fb3 100755
--- a/src/view/overview.vue
+++ b/src/view/overview.vue
@@ -340,11 +340,6 @@ export default {
                   }else if(weizhi == "N"){
                       // 轮播
                       this.lunBoList = res.data.records
-<<<<<<< HEAD
-=======
-                      console.log(JSON.stringify(this.lunBoList))
-                      console.log(id)
->>>>>>> e30a98a1e8fa5d15bcac9b801b3c04b02c6dba55
                   }
               }
           }