From 6c4bf865ed5beba56e08718973bf05b03e38f009 Mon Sep 17 00:00:00 2001
From: Kyle Horimoto <khorimoto@gmail.com>
Date: Fri, 4 Sep 2015 14:23:01 -0700
Subject: Add .idea/gradle.xml and app/app.iml to .gitignore files.

These files change according to the individual user's machine each time the project is edited by Android Studio.
---
 .idea/.gitignore | 1 -
 .idea/gradle.xml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to '.idea')

diff --git a/.idea/.gitignore b/.idea/.gitignore
index 8e587e7..ff07e6f 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -4,7 +4,6 @@
 !/copyright/*.xml
 !/fileColors.xml
 !/encodings.xml
-!/gradle.xml
 !/runConfigurations/*.xml
 
 !/inspectionProfiles/*.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8d2df47..1bbc21d 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
-- 
cgit v1.2.3