From 4488f711dbc01a8db6753907cae2ef4021dede68 Mon Sep 17 00:00:00 2001
From: FUYU <fuyu@prec-tech.com>
Date: 星期三, 13 十二月 2023 16:30:27 +0800
Subject: [PATCH] 修改前备份
---
.sf/config.json | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/.sf/config.json b/.sf/config.json
index ce048d6..9e6a1d3 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,6 +1,3 @@
-<<<<<<< HEAD
-=======
{
- "target-org": "OlympusStageEnv"
+ "target-org": "OlympusStageEnv"
}
->>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1