Skip to content

Commit 1adf6b2

Browse files
author
moiling
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # .idea/gradle.xml # .idea/misc.xml # build/intermediates/dex-cache/cache.xml
2 parents e303494 + 0369875 commit 1adf6b2

24 files changed

+24
-74
lines changed

‎.gitignore

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,12 @@ proguard/
2626
*.iml
2727
*.ipr
2828
*.iws
29-
.idea/
29+
.idea/
30+
.gradle
31+
/local.properties
32+
/.idea/workspace.xml
33+
/.idea/libraries
34+
.DS_Store
35+
/build
36+
/captures
37+
.externalNativeBuild

‎.gradle/2.2.1/taskArtifacts/cache.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.gradle/2.2.1/taskArtifacts/cache.properties.lock

-17 Bytes
Binary file not shown.

‎.gradle/2.2.1/taskArtifacts/fileHashes.bin

-282 KB
Binary file not shown.

‎.gradle/2.2.1/taskArtifacts/fileSnapshots.bin

-10.9 MB
Binary file not shown.

‎.gradle/2.2.1/taskArtifacts/outputFileStates.bin

-20.2 KB
Binary file not shown.

‎.gradle/2.2.1/taskArtifacts/taskArtifacts.bin

-108 KB
Binary file not shown.

‎.gradle/2.4/taskArtifacts/cache.properties

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.gradle/2.4/taskArtifacts/cache.properties.lock

-17 Bytes
Binary file not shown.

‎.gradle/2.4/taskArtifacts/fileHashes.bin

-420 KB
Binary file not shown.

0 commit comments

Comments
 (0)