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

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

diff --git a/local.properties b/local.properties
index e7b3898..e8d918b 100644
--- a/local.properties
+++ b/local.properties
@@ -4,5 +4,6 @@
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-#Sun Aug 06 16:06:53 CST 2023
-sdk.dir=/Users/user/Library/Android/sdk
+#Thu Dec 14 10:02:46 CST 2023
+#sdk.dir=/Users/user/Library/Android/sdk
+sdk.dir=/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx

--
Gitblit v1.8.0