From beadecb2bbc75b8f153d366df11246719cf97b2f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 23 二月 2024 14:37:25 +0800
Subject: [PATCH] Merge branch 'dev-hxb' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into dev-hxb

---
 .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