From 38e8e7b31b1b9deb39019ef8a1607d494022fab3 Mon Sep 17 00:00:00 2001 From: varac Date: Mon, 19 Dec 2016 10:41:47 +0100 Subject: git subrepo pull files/puppet/modules/pixelated subrepo: subdir: "files/puppet/modules/pixelated" merged: "21f0340" upstream: origin: "https://github.com/pixelated/puppet-pixelated.git" branch: "master" commit: "21f0340" git-subrepo: version: "0.3.0" origin: "https://github.com/ingydotnet/git-subrepo.git" commit: "841aa43" --- files/puppet/modules/pixelated/.gitignore | 1 - 1 file changed, 1 deletion(-) (limited to 'files/puppet/modules/pixelated/.gitignore') diff --git a/files/puppet/modules/pixelated/.gitignore b/files/puppet/modules/pixelated/.gitignore index f974e08..3937395 100644 --- a/files/puppet/modules/pixelated/.gitignore +++ b/files/puppet/modules/pixelated/.gitignore @@ -1,7 +1,6 @@ # ignore rake spec module checkouts **/spec/fixtures/modules/ **/spec/fixtures/manifests/ -/Gemfile.lock # deployed by vagrant_platform.sh /leap_platform # ignore files created by functional test -- cgit v1.2.3