后台保护协议

src/pages/backgrounder/index.vue

@@ -1,19 +1,9 @@
 <template>
-<<<<<<< HEAD
   <div class="app-container"></div>
-=======
-  <view class="app-container">
-
-  </view>
->>>>>>> test
 </template>
 
 <script>
 export default {
-<<<<<<< HEAD
-  created() {
-    window.location.href = "https://ohplay.radio1964.net/guide"
-=======
   data() {
     return {
 
@@ -21,15 +11,10 @@ export default {
   },
   created(){
     window.location.href = 'https://ohplay.radio1964.net/guide'
->>>>>>> test
   }
 }
 </script>
 
-<<<<<<< HEAD
-<style lang="scss" scoped></style>
-=======
 <style lang="scss">
 
 </style>
->>>>>>> test