Skip to content

Commit aca7ecd

Browse files
committed
Merge branch 'master' of github.com:donglua/GitHubClient
# Conflicts: # .gitignore # LICENSE
2 parents 7180b1d + 5be8779 commit aca7ecd

File tree

2 files changed

+196
-180
lines changed

2 files changed

+196
-180
lines changed

.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,9 @@ proguard/
3737

3838
# Log Files
3939
*.log
40+
41+
# Android Studio Navigation editor temp files
42+
.navigation/
43+
44+
# Android Studio captures folder
45+
captures/

0 commit comments

Comments
 (0)