From 77688e52fdc2761f17ce24be9704ee25bff2194d Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期三, 04 十二月 2024 13:55:21 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0

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

diff --git a/.gitignore b/.gitignore
index 6d95062..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/
@@ -48,3 +47,8 @@
 .DS_Store
 app/.DS_Store
 
+
+local.properties
+.idea/workspace.xml
+.idea/
+*.properties

--
Gitblit v1.8.0