summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorgan Haskel <morgan@puppetlabs.com>2014-12-29 11:22:11 -0800
committerMorgan Haskel <morgan@puppetlabs.com>2014-12-29 11:22:11 -0800
commit79e79e8bbad5f3226b51fae5a2a64bc9a84031ae (patch)
treec82331f3e3c74b04740d60a2284ba3120e06e2ca
parentdcc9605a8434164494dd2912424c8eef83b86ee5 (diff)
parent9077bfef1e3313b7cd7f89cfec95132466730325 (diff)
Merge pull request #394 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