From 2eb2915d54c895c9f668c5ccf46fc1082229a26d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 18 七月 2025 19:07:01 +0800
Subject: [PATCH] 前端
---
small-program/unpackage/dist/dev/mp-weixin/pages/rich-text-page/rich-text-page.js | 6 +-----
1 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/small-program/unpackage/dist/dev/mp-weixin/pages/rich-text-page/rich-text-page.js b/small-program/unpackage/dist/dev/mp-weixin/pages/rich-text-page/rich-text-page.js
index 6305a7e..c51b1aa 100644
--- a/small-program/unpackage/dist/dev/mp-weixin/pages/rich-text-page/rich-text-page.js
+++ b/small-program/unpackage/dist/dev/mp-weixin/pages/rich-text-page/rich-text-page.js
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
(global["webpackJsonp"] = global["webpackJsonp"] || []).push([["pages/rich-text-page/rich-text-page"],{
/***/ 372:
@@ -213,7 +212,4 @@
/***/ })
},[[372,"common/runtime","common/vendor"]]]);
-//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/rich-text-page/rich-text-page.js.map
-=======
-Component({})
->>>>>>> bbd9c436f23f5fdbe712c4a22d90b457066bdf38
+//# sourceMappingURL=../../../.sourcemap/mp-weixin/pages/rich-text-page/rich-text-page.js.map
\ No newline at end of file
--
Gitblit v1.9.3