Fixed issues with line endings and a botched config template

This commit is contained in:
Nelson LaQuet 2015-04-11 20:34:34 -05:00
parent f484caf9e6
commit 0452b25683
3 changed files with 4 additions and 1 deletions

2
.gitignore vendored
View file

@ -1,3 +1,5 @@
.vagrant
# Numerous always-ignore extensions # Numerous always-ignore extensions
*.diff *.diff
*.err *.err

1
vagrant/.gitattributes vendored Normal file
View file

@ -0,0 +1 @@
* eol=lf

View file

@ -9,6 +9,6 @@ return array(
'url' => 'pony.fm.local', 'url' => 'pony.fm.local',
'files_directory' => '/vagrant-files/', 'files_directory' => '/vagrant-files/',
'node' => null, 'node' => null,
'node_paths' => ['node'], 'node_paths' => ['/usr/lib/node_modules/'],
'secure' => false, 'secure' => false,
); );