## 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
#Fri Jan 22 00:12:54 CET 2016
=======
<<<<<<< HEAD
#Thu Jan 21 20:57:23 CET 2016
sdk.dir=C\:\\Android
=======
#Thu Jan 21 22:00:45 CET 2016
>>>>>>> f003b2ed3c45bc52fbfd8b3ed0e00426040727c0
sdk.dir=C\:\\Program Files (x86)\\Android\\android-sdk
>>>>>>> 3333e9eb4a430bda0cc488281fef2864949ca135