summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorTravis Fields <travis@puppetlabs.com>2015-01-13 17:16:10 -0800
committerTravis Fields <travis@puppetlabs.com>2015-01-13 17:16:10 -0800
commitac3e51bac57ecc4b29965b5df5f10c2934b61cd0 (patch)
tree71413b757c0e0ec4d21727386979354e50099fdc /.gitignore
parent80f09623b63cf6946b5913b629911e2c49b5d1dd (diff)
parent8db1f2e2f082cd688fa061fd6840cd0cea747232 (diff)
Merge branch 'master' into 4.5.x
Diffstat (limited to '.gitignore')
-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