From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict

---
 .gitignore |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/.gitignore b/.gitignore
index cecd6fb..dc55618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,4 @@
 # Local environment variables
 .env
 .vim-force.com/session.properties
+.sf/config.json

--
Gitblit v1.9.1