From 89d77a7cd7285feda993bffec2513892f8bd355f Mon Sep 17 00:00:00 2001
From: Mr.Shi <1878285526@qq.com>
Date: 星期一, 28 八月 2023 14:41:02 +0800
Subject: [PATCH] 小程序

---
 minipro_standard/main.js |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/minipro_standard/main.js b/minipro_standard/main.js
index db947f8..af1b29b 100644
--- a/minipro_standard/main.js
+++ b/minipro_standard/main.js
@@ -1,10 +1,7 @@
 import Vue from 'vue'
 import App from './App'
 import mixin from './common/mixin'
-<<<<<<< HEAD
-=======
 
->>>>>>> 572591bc99c61e648d60b9bf148b2ab2e0ee4e2e
 // 寮曞叆鍏ㄥ眬uView
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)

--
Gitblit v1.9.3