冲突解决

src/view/tabs/home-screen.vue

@@ -1,5 +1,4 @@
 <template>
-<<<<<<< HEAD
   <div id="home-screen-wrapper">
     <div class="bg-video" @click="changeAnimation()">
       <!-- 关机动画循环 -->
@@ -36,20 +35,6 @@
         v-show="currentAnimation === 3"
         ref="animationExit"
       ></video>
-=======
-  <div id="home-screen-wrapper">
-    <div class="nav-top">
-      <div class="wifi-icon">
-        <img src="@/assets/imgs/home-screen/WIFI@2x.png" alt="">
-      </div>
-      <div class="weather">雪天</div>
-      <div class="temp">-26℃</div>
-    </div>
-    <div class="content">
-      <div class="content-left">
-        <div class="time" @c="envSelect">
-          {{ hour }}<span>:</span>{{ minutes }}
->>>>>>> 267250d (定时添加)
     </div>
 
     <div class="nav-top">