aboutsummaryrefslogtreecommitdiffstats
path: root/.idea
diff options
context:
space:
mode:
authorKyle Horimoto <khorimoto@gmail.com>2015-09-04 14:23:01 -0700
committerKyle Horimoto <khorimoto@gmail.com>2015-09-04 14:53:44 -0700
commit6c4bf865ed5beba56e08718973bf05b03e38f009 (patch)
tree97821f7e1f4a60c777bab88ef0ddd6ee0d338b33 /.idea
parent44c7bcfa9f7ae69fa481b100bcfba5e1387eee9c (diff)
downloadconnectbot-6c4bf865ed5beba56e08718973bf05b03e38f009.tar.gz
connectbot-6c4bf865ed5beba56e08718973bf05b03e38f009.tar.bz2
connectbot-6c4bf865ed5beba56e08718973bf05b03e38f009.zip
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.
Diffstat (limited to '.idea')
-rw-r--r--.idea/.gitignore1
-rw-r--r--.idea/gradle.xml2
2 files changed, 1 insertions, 2 deletions
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$" />