From 1b31fc28fb80025345246f93f10507a15412cc75 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期一, 18 九月 2023 13:31:11 +0800
Subject: [PATCH] Merge branch 'androidx' of http://172.16.1.23:6688/r/~cjl/HDLSDK_A_Android into androidx

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

diff --git a/.gitignore b/.gitignore
index 110ac68..ab36ff1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@
 ### Android ###
 # Built application files
 *.apk
-*.aar
+# *.aar
 *.ap_
 *.aab
 
@@ -53,6 +53,7 @@
 # Android Studio 3 in .gitignore file.
 .idea/caches
 .idea/modules.xml
+.idea/
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
 
@@ -100,4 +101,9 @@
 # Replacement of .externalNativeBuild directories introduced
 # with Android Studio 3.5.
 
-# End of https://www.toptal.com/developers/gitignore/api/android
\ No newline at end of file
+# End of https://www.toptal.com/developers/gitignore/api/android
+.idea/
+HDLSDK/.idea/jarRepositories.xml
+HDLSDK/.idea/misc.xml
+HDLSDK/.idea/jarRepositories.xml
+HDLSDK/.idea/misc.xml

--
Gitblit v1.8.0