local.properties

## 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
#Wed Jul 11 00:26:20 CST 2018
>>>>>>>=442e37c9239c0206957127171e61a314cae04f20
sdk.dir=F\:\\Android\\AndroidSDK
=\=\=\=\=\=\=
<<<<<<<=HEAD
=======
<<<<<<< HEAD
<<<<<<< HEAD
#Mon Jul 09 00:13:04 CST 2018
sdk.dir=F\:\\Android\\AndroidSDK
=======
#Tue Jul 10 22:33:37 CST 2018
sdk.dir=E\:\\Android\\sdk
<<<<<<< HEAD

=======
=\=\=\=\=\=\=
<<<<<<<=HEAD
>>>>>>> 442e37c9239c0206957127171e61a314cae04f20
>>>>>>> 513ee08aea6c2673255747b007a0eca1096f8577
=======
#Fri Jul 13 22:16:41 CST 2018
>>>>>>>=442e37c9239c0206957127171e61a314cae04f20
sdk.dir=E\:\\develop\\Android\\android-sdk
=\=\=\=\=\=\=
<<<<<<<=HEAD
>>>>>>> 7a96b3d64c93e034bec04458109372ae3b7d50b1
>>>>>>> 33e2f8f54477ee4593ff1f60bf64ef9b73cb2ffc