atomaka
/
my-boxen
1
0
Fork 0
Code Releases Activity

Regen lock file

This commit is contained in:
Andrew Tomaka 2014-05-01 00:40:01 -04:00
parent 36c2746008
commit 5a986daf83
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Puppetfile.lock
View File

@ -224,40 +224,39 @@ GITHUBTARBALL
module-data (0.0.3)
DEPENDENCIES
<<<<<<< HEAD
adium (= 1.2.0)
alfred (= 1.1.7)
boxen (= 3.4.2)
caffeine (= 1.0.0)
chrome (= 1.1.2)
dnsmasq (= 1.0.1)
dropbox (= 1.2.0)
firefox (= 1.1.5)
flux (= 1.0.1)
heroku (= 2.0.0)
iterm2 (= 1.0.4)
league_of_legends (= 1.1.2)
libreoffice (= 4.1.3)
osx (= 2.2.0)
python (= 1.1.1)
qt (= 1.1.0)
skype (= 1.0.7)
spotify (= 1.0.1)
boxen (= 3.4.2)
dnsmasq (= 1.0.1)
foreman (= 1.2.0)
gcc (= 2.0.100)
git (= 2.3.0)
go (= 1.1.0)
heroku (= 2.0.0)
homebrew (= 1.6.2)
hub (= 1.3.0)
inifile (= 1.0.3)
iterm2 (= 1.0.4)
league_of_legends (= 1.1.2)
libreoffice (= 4.1.3)
module-data (= 0.0.3)
nginx (= 1.4.3)
nodejs (= 3.7.0)
openssl (= 1.0.0)
osx (= 2.2.0)
phantomjs (= 2.3.0)
pkgconfig (= 1.0.0)
python (= 1.1.1)
qt (= 1.1.0)
repository (= 2.3.0)
ruby (= 7.3.0)
skype (= 1.0.7)
spotify (= 1.0.1)
stdlib (= 4.1.0)
sublime_text_2 (= 1.1.2)
sudo (= 1.0.0)
@ -268,6 +267,6 @@ DEPENDENCIES
vlc (= 1.0.5)
wget (= 1.0.0)
whatpulse (= 0.1.1)
zsh (= 1.0.0)
xquartz (= 1.1.1)
zsh (= 1.0.0)