minor fixes

This commit is contained in:
duybkict 2016-05-26 16:52:57 +07:00 committed by Matt Lott
parent 877bea35e7
commit ebab0dedec

4
Vagrantfile vendored
View file

@ -19,10 +19,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
config.vm.define "default" do |default|
default.vm.provision "shell", path: "scripts/vagrant/core/provision.sh", privileged: false
<<<<<<< HEAD
=======
>>>>>>> f148776... add new vagrant box "brunchv2", revert npm package upgrades in package.json
end
config.vm.define "brunchv2", autostart: false do |brunchv2|