17 lines
598 B
Properties
17 lines
598 B
Properties
## This file is automatically generated by Android Studio.
|
|
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
#
|
|
# 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
|
|
#Thu Jan 21 20:57:23 CET 2016
|
|
sdk.dir=C\:\\Android
|
|
=======
|
|
#Thu Jan 21 22:00:45 CET 2016
|
|
sdk.dir=C\:\\Program Files (x86)\\Android\\android-sdk
|
|
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135
|