From aff3fa0de93fccd4851ca378c3840acb2b572375 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 04 十二月 2024 17:06:58 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0

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

diff --git a/.gitignore b/.gitignore
index b186b24..fac7ee0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,7 @@
 # Proguard folder generated by Eclipse
 proguard/
 
-# Local configuration file (sdk path, etc)
-local.properties
+
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -46,4 +45,10 @@
 *.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
+
+
+local.properties
+.idea/workspace.xml
+.idea/
+*.properties

--
Gitblit v1.8.0