From 0452b256835d7a35488c4efea2a89efee6244869 Mon Sep 17 00:00:00 2001 From: Nelson LaQuet Date: Sat, 11 Apr 2015 20:34:34 -0500 Subject: [PATCH] Fixed issues with line endings and a botched config template --- .gitignore | 2 ++ vagrant/.gitattributes | 1 + vagrant/config/app.php | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 vagrant/.gitattributes diff --git a/.gitignore b/.gitignore index 63520024..20e1ee9b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ +.vagrant + # Numerous always-ignore extensions *.diff *.err diff --git a/vagrant/.gitattributes b/vagrant/.gitattributes new file mode 100644 index 00000000..44b4224b --- /dev/null +++ b/vagrant/.gitattributes @@ -0,0 +1 @@ +* eol=lf \ No newline at end of file diff --git a/vagrant/config/app.php b/vagrant/config/app.php index 4e7f61fd..81554a15 100644 --- a/vagrant/config/app.php +++ b/vagrant/config/app.php @@ -9,6 +9,6 @@ return array( 'url' => 'pony.fm.local', 'files_directory' => '/vagrant-files/', 'node' => null, - 'node_paths' => ['node'], + 'node_paths' => ['/usr/lib/node_modules/'], 'secure' => false, ); \ No newline at end of file