From 57b7b6bbfd711caffa1576bf265172ae9da4b40a Mon Sep 17 00:00:00 2001
From: zhangzengfei <zhangzengfei@iotlink.com>
Date: 星期五, 21 五月 2021 14:37:52 +0800
Subject: [PATCH] merge master

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

diff --git a/.gitignore b/.gitignore
index c2eda07..c1583fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,4 +24,5 @@
 *.sw*
 
 # webpack config inspector
-output.js
\ No newline at end of file
+output.js
+vue.config.js
\ No newline at end of file

--
Gitblit v1.8.0