From 29291988d5f4c294949d6893dcb93b5a7a261c62 Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期四, 29 二月 2024 19:30:39 +0800
Subject: [PATCH] 1
---
custom-tab-bar/data.js | 6 ------
1 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/custom-tab-bar/data.js b/custom-tab-bar/data.js
index 15a8a50..5bd6ab5 100644
--- a/custom-tab-bar/data.js
+++ b/custom-tab-bar/data.js
@@ -27,13 +27,7 @@
{
text: '涓汉涓績',
url: 'pages/personalCenter/index',
-<<<<<<< HEAD
-<<<<<<< HEAD
icon: '/static/images/home/my@2x.png',
activeIcon: '/static/images/home/my-click@2x.png'
-=======
->>>>>>> master
-=======
->>>>>>> master
},
];
--
Gitblit v1.9.1