From 1ef9c12f9e1edd46fd3edac5363d3519a5e0c05f Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 30 五月 2024 21:12:37 +0800
Subject: [PATCH] Merge branch 'wjc_new' into develop_new

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

diff --git a/local.properties b/local.properties
index 1a98706..c2a6576 100644
--- a/local.properties
+++ b/local.properties
@@ -1,10 +1,8 @@
-## This file is automatically generated by Android Studio.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file should *NOT* be checked into Version Control Systems,
+## This file must *NOT* be checked into Version Control Systems,
 # as it contains information specific to your local configuration.
 #
 # Location of the SDK. This is only used by Gradle.
 # For customization when using a Version Control System, please read the
 # header note.
-sdk.dir=/Users/wenjucheng/Library/Android/sdk
\ No newline at end of file
+#Wed May 22 11:24:49 CST 2024
+sdk.dir=/Users/hdl/Library/Developer/Xamarin/android-sdk-macosx

--
Gitblit v1.8.0