From 60b132f45689417d47f5130482b62837d8cd349f Mon Sep 17 00:00:00 2001
From: ltlzx <942659938@qq.com>
Date: Wed, 9 Feb 2022 14:38:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Hoster/Listing.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/page/Hoster/Listing.vue b/src/components/page/Hoster/Listing.vue
index cfa1ac8..d60a059 100644
--- a/src/components/page/Hoster/Listing.vue
+++ b/src/components/page/Hoster/Listing.vue
@@ -722,11 +722,7 @@ export default {
             // if (this.ruleForm.payment_document=='') {
             //   this.editVisible=true
             // }else{
-<<<<<<< HEAD
               this.loading=true
-=======
-              // this.loading=true
->>>>>>> 4d64f54053961759a3b806da4fe29546dd47eb26
               if(this.query.type==2){
                 this.update_cartellino()
               }else{