Layoutanpassungen
This commit is contained in:
@@ -7,5 +7,10 @@
|
||||
# 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
|
||||
|
||||
Reference in New Issue
Block a user