Merge branch 'master' of C:\ph\keepass2android
Conflicts: src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileHashes.bin src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin src/java/KP2ASoftkeyboard_AS/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
This commit is contained in:
@@ -7,5 +7,5 @@
|
||||
# Location of the SDK. This is only used by Gradle.
|
||||
# For customization when using a Version Control System, please read the
|
||||
# header note.
|
||||
#Tue Sep 20 20:29:56 CEST 2016
|
||||
#Mon Sep 05 10:28:53 CEST 2016
|
||||
sdk.dir=C\:\\Users\\Philipp\\AppData\\Local\\Xamarin\\Universal\\AndroidSDK
|
||||
|
||||
Reference in New Issue
Block a user