You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
14 lines
458 B
14 lines
458 B
## 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.
|
|
<<<<<<< HEAD:local.properties
|
|
#Wed Jun 07 13:25:38 CST 2023
|
|
sdk.dir=D\:\\Android\\SDK
|
|
=======
|
|
#Thu Apr 27 00:30:42 CST 2023
|
|
sdk.dir=D\:\\Androidsdk
|
|
>>>>>>> master:src/local.properties
|