From e745dd38c5a413eaa000c7c5434621fbcd1800d5 Mon Sep 17 00:00:00 2001
From: 于紫祥_1901 <email@yuzixiang_1910>
Date: Wed, 23 Dec 2020 13:55:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/.gitignore b/.gitignore
index 2af7cef..2661ec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,4 +21,6 @@
 nbbuild/
 dist/
 nbdist/
-.nb-gradle/
\ No newline at end of file
+.nb-gradle/
+
+generatorConfig.xml
\ No newline at end of file

--
Gitblit v1.8.0