mirror of
https://github.com/codeninjasllc/codecombat.git
synced 2025-02-17 00:40:56 -05:00
minor fixes
This commit is contained in:
parent
877bea35e7
commit
ebab0dedec
1 changed files with 0 additions and 4 deletions
4
Vagrantfile
vendored
4
Vagrantfile
vendored
|
@ -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|
|
||||
|
|
Loading…
Reference in a new issue