From 29bac6b2c41fbf013271ab6dc8bd1f4bd30905a6 Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期五, 30 六月 2023 17:32:25 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP

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

diff --git a/.gitignore b/.gitignore
index 6d95062..43124f4 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,5 @@
 .DS_Store
 app/.DS_Store
 
+
+local.properties

--
Gitblit v1.8.0