From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
.vscode/settings.json | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 7f69778..f2bf3ab 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -5,5 +5,6 @@
"**/.sfdx": true
},
"salesforcedx-vscode-core.show-cli-success-msg": false,
+ "salesforcedx-vscode-apex.java.home": "C:\\Users\\buli\\Documents\\Software\\JDK11\\",
"open-in-browser.default": "{\"opn-in-browser.default\":\"Microsoft Edge\"}"
}
--
Gitblit v1.9.1