From ea1a8cf41c11f8f533cea594e1f1c03640cf4a96 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 29 四月 2024 16:26:28 +0800
Subject: [PATCH] 合并冲突

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

diff --git a/.gitignore b/.gitignore
index 8142978..d6143ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@
 # Editor directories and files
 .idea
 .vscode
+.nvmdrc
 *.suo
 *.ntvs*
 *.njsproj
@@ -29,6 +30,3 @@
 # Lock File
 package-lock.json
 yarn.lock
-
-# config.js
-vue.config.js

--
Gitblit v1.9.3