From f443b27dd9dcf5af1339439689531536e85836c7 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 12 三月 2024 15:55:48 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/.gitignore b/.gitignore
index 75713dd..d6143ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 # Editor directories and files
 .idea
 .vscode
+.nvmdrc
 *.suo
 *.ntvs*
 *.njsproj

--
Gitblit v1.9.3