From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
.sf/config.json | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/.sf/config.json b/.sf/config.json
index 3debff0..ce048d6 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,3 +1,6 @@
+<<<<<<< HEAD
+=======
{
"target-org": "OlympusStageEnv"
-}
\ No newline at end of file
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1