From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
.sf/config.json | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/.sf/config.json b/.sf/config.json
index e69de29..ce048d6 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -0,0 +1,6 @@
+<<<<<<< HEAD
+=======
+{
+ "target-org": "OlympusStageEnv"
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1