From: Brendan Forster <github@brendanforster.com>
Date: Wed, 11 Apr 2018 04:15:41 +0000 (+1000)
Subject: Merge pull request #2648 from leesah/master
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=65d42ea0062039a1ffd97e330c35c6bacfab92b3;p=gitignore.git

Merge pull request #2648 from leesah/master

Update Android.gitignore
---

65d42ea0062039a1ffd97e330c35c6bacfab92b3
diff --cc Android.gitignore
index 6d3df345,9f746c2c..39b6783c
--- a/Android.gitignore
+++ b/Android.gitignore
@@@ -37,9 -37,9 +37,10 @@@ captures
  .idea/workspace.xml
  .idea/tasks.xml
  .idea/gradle.xml
+ .idea/assetWizardSettings.xml
  .idea/dictionaries
  .idea/libraries
 +.idea/caches
  
  # Keystore files
  # Uncomment the following line if you do not want to check your keystore files in.