From ec1f215104adc5e8134d573e0e50a611cabe047a Mon Sep 17 00:00:00 2001
From: sunzhenyu <sunzhenyu@joylink.club>
Date: Tue, 29 Dec 2020 10:00:44 +0800
Subject: [PATCH] merge

---
 src/views/newMap/jointTrainingNew/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/newMap/jointTrainingNew/index.vue b/src/views/newMap/jointTrainingNew/index.vue
index c39f55372..0f5030b15 100644
--- a/src/views/newMap/jointTrainingNew/index.vue
+++ b/src/views/newMap/jointTrainingNew/index.vue
@@ -408,7 +408,6 @@ export default {
                 this.hideIbp();
             }
         },
-<<<<<<< HEAD
         async getTrainDetail() {
             try {
                 // await loadNewMapDataByGroup(this.group);
@@ -422,8 +421,6 @@ export default {
                 this.endViewLoading();
             }
         },
-=======
->>>>>>> 8b2291e18b7c517f153aaea124740b2245fbd332
         back() {
             this.$refs.demonMenu.back();
         },