summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2014-12-29 11:22:00 -0800
committerMorgan Haskel <morgan@puppetlabs.com>2014-12-29 11:22:00 -0800
commit4fb88bb65d00dcf573ec873519fc6b78c40d2b56 (patch)
tree99240f0d4c8b8bf5cfcabc4d317daacafc4859f3
parentce6b7d3b1ebf54b5b4073769ac38c342e2afc147 (diff)
parent477666d6ccbf5c882ff0f2ffff117adbe9030779 (diff)
Merge pull request #226 from cmurphy/master
Add IntelliJ files to the ignore list
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b5b7a00..b5db85e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ spec/fixtures/
.vagrant/
.bundle/
coverage/
+.idea/
+*.iml