From 12d6db5780d8a2121a3bef2d58bf897b24ff552a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 12 六月 2024 15:54:29 +0800
Subject: [PATCH] Merge branch 'dev'

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

diff --git a/local.properties b/local.properties
index 1a98706..603f0a1 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
+#Mon May 27 13:53:42 CST 2024
+sdk.dir=/Users/user/Library/Android/sdk

--
Gitblit v1.8.0