summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorvarac <varacanero@zeromail.org>2017-01-13 12:41:58 +0100
committervarac <varacanero@zeromail.org>2017-01-13 12:41:58 +0100
commit066c08f8362d53f0f30897cb8710d11260c726ea (patch)
treea6369eecd88bb731fe413d0bbc8af73d74d1f447 /.gitignore
parent71123634744b9fe2ec7d6a3e38e9789fd84801e3 (diff)
parentb65dd1f45d10e10e45455358aeabb29167990e2c (diff)
Merge remote-tracking branch 'origin/master' into leap_master
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore8
1 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index b5db85e..33bc5ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,15 @@
+#This file is generated by ModuleSync, do not edit.
pkg/
Gemfile.lock
vendor/
-spec/fixtures/
+spec/fixtures/manifests/
+spec/fixtures/modules/
.vagrant/
.bundle/
coverage/
+log/
.idea/
*.iml
+!spec/fixtures/
+spec/fixtures/manifests/site.pp
+spec/fixtures/modules/*