Merge pull request #273 from ZogStriP/misc

updated sublime-project & vagrant file
This commit is contained in:
Robin Ward 2013-02-26 14:31:16 -08:00
commit f9acff3579
2 changed files with 24 additions and 23 deletions

3
Vagrantfile vendored
View File

@ -25,8 +25,7 @@ Vagrant::Config.run do |config|
config.vm.forward_port 3000, 4000
config.vm.forward_port 1080, 4080 # Mailcatcher
nfs_setting = (RUBY_PLATFORM =~ /darwin/ or
RUBY_PLATFORM =~ /linux/) ? true : false
nfs_setting = RUBY_PLATFORM =~ /darwin/ || RUBY_PLATFORM =~ /linux/
config.vm.share_folder("v-root", "/vagrant", ".", :nfs => nfs_setting)
chef_cookbooks_path = ["chef/cookbooks"]

View File

@ -17,7 +17,9 @@
],
"settings":
{
// indentation
"tab_size": 2,
"translate_tabs_to_spaces": true
"translate_tabs_to_spaces": true,
"trim_trailing_white_space_on_save": true,
}
}