From 21f03965774e4b351701595c29c7e484f6bc7e7c Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Wed, 18 May 2022 10:17:14 +0800
Subject: [PATCH] fix issue

---
 web_src/js/index.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/web_src/js/index.js b/web_src/js/index.js
index 17448df7a..f3f25c03a 100755
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -4492,11 +4492,7 @@ function initVueDataAnalysis() {
 
   new Vue({
     el: '#data_analysis',
-<<<<<<< HEAD
-
-=======
     router,
->>>>>>> V20220519
     render: h => h(DataAnalysis)
   });
 }