From 42abb2a599e9c863ab890ef7d8d43db1acdfe84d Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@puppetlabs.com>
Date: Wed, 25 Jun 2014 18:01:00 -0700
Subject: Sync files

---
 .gitignore | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index b5fe773..b5b7a00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,7 @@
-coverage
-.DS_Store
-.#*
-\#*
+pkg/
 Gemfile.lock
-log
-.vagrant
-
-#Intellij
-.idea
-*.iml
+vendor/
+spec/fixtures/
+.vagrant/
+.bundle/
+coverage/
-- 
cgit v1.2.3