summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAshley Penney <ashley.penney@puppetlabs.com>2014-05-19 08:09:13 -0700
committerAshley Penney <ashley.penney@puppetlabs.com>2014-05-19 08:09:13 -0700
commit059599691d4cf08ce012e4b057d0c82525ba163a (patch)
tree9587ade7c8b6caf7b8bcaba621ec059cdf1a9d87 /.gitignore
parent4021245ebb54878c691d50efe3f9ce712734e4b6 (diff)
parent4613e93e35551271651bb7b1102d3b97a3f5b40d (diff)
Merge pull request #139 from cyberious/FM-1284
Fix detached head state
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ddd2d45..44e004c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,9 @@ coverage
.DS_Store
.#*
\#*
+Gemfile.lock
+log
+
+#Intellij
+.idea
+*.iml