From bf2930c4a5874d4fd878cfe2f23a87de00db4de1 Mon Sep 17 00:00:00 2001
From: "douboer@gmail.com" <gavin@gavin-mac-mini.local>
Date: Fri, 13 Feb 2026 22:43:18 +0800
Subject: [PATCH] update at 2026-02-13 22:43:18

---
 miniapp/project.config.json | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/miniapp/project.config.json b/miniapp/project.config.json
index 0566499..00e0720 100644
--- a/miniapp/project.config.json
+++ b/miniapp/project.config.json
@@ -1,24 +1,9 @@
 {
-<<<<<<< HEAD
   "description": "sankey miniapp standalone config",
   "packOptions": {
-    "ignore": []
+    "ignore": [],
+    "include": []
   },
-  "setting": {
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "minified": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "trial",
-  "appid": "wxcf0f89b6eb65759e",
-  "projectname": "sankey-miniapp",
-  "miniprogramRoot": "./",
-  "srcMiniprogramRoot": "./",
-  "condition": {}
-}
-=======
   "setting": {
     "es6": true,
     "postcss": true,
@@ -36,11 +21,10 @@
   },
   "compileType": "miniprogram",
   "simulatorPluginLibVersion": {},
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
   "appid": "wxcf0f89b6eb65759e",
-  "editorSetting": {}
+  "projectname": "sankey-miniapp",
+  "miniprogramRoot": "./",
+  "srcMiniprogramRoot": "./",
+  "editorSetting": {},
+  "condition": {}
 }
->>>>>>> 2cafdbb8fe6909bf187472a961427bb67e990218