From 4cae7b89b60956e6c23e4c6e7a9e5a7b76927c53 Mon Sep 17 00:00:00 2001
From: ZZJ <zzjdsg2300@163.com>
Date: 星期二, 16 十一月 2021 14:02:05 +0800
Subject: [PATCH] 解决冲突

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

diff --git a/.gitignore b/.gitignore
index 3bbae91..b9f7285 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 node_modules
 /dist
 /app
+/public/fonts
 
 package-lock.json
 
@@ -22,3 +23,7 @@
 *.njsproj
 *.sln
 *.sw*
+
+# webpack config inspector
+output.js
+vue.config.js
\ No newline at end of file

--
Gitblit v1.8.0