From 07671116767c77058b3ce584be161b4b194ec9bd Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期五, 30 六月 2023 15:57:59 +0800
Subject: [PATCH] Merge branch 'hxb' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into hxb

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

diff --git a/.gitignore b/.gitignore
index b186b24..6d95062 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@
 proguard/
 
 # Local configuration file (sdk path, etc)
-local.properties
+.local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -46,4 +46,5 @@
 *.log
 .idea/libraries/Gradle__com_bulong_rudeness_rudeness_0_1_4_aar.xml
 .DS_Store
-app/.DS_Store
\ No newline at end of file
+app/.DS_Store
+

--
Gitblit v1.8.0