From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001 From: buli <137736985@qq.com> Date: 星期五, 14 七月 2023 15:10:02 +0800 Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte --- .sf/config.json | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.sf/config.json b/.sf/config.json index baca826..ce048d6 100644 --- a/.sf/config.json +++ b/.sf/config.json @@ -1,3 +1,6 @@ +<<<<<<< HEAD +======= { - "target-org": "LEXOlympusDev" -} \ No newline at end of file + "target-org": "OlympusStageEnv" +} +>>>>>>> LEXCommunityLiJun -- Gitblit v1.9.1