From 41660a11fb793295d44a4d47949284105e429395 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 18 Aug 2023 14:56:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into cjl-230812

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

diff --git a/.gitignore b/.gitignore
index 794103a..ca503f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@
 # should NOT be excluded as they contain compiler settings and other important
 # information for Eclipse / Flash Builder.
 /.idea/
-/screen-api/target/
+
 /screen-common/target/
 /screen-manage/target/
 /.idea/

--
Gitblit v1.8.0