diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-21 17:54:12 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-21 17:54:12 -0400 |
| commit | ee3c7892ad585e2e702d8975420d25ae052d97bb (patch) | |
| tree | 71c23600099fe5670482f8900d787dbc7c9551b2 /Vagrantfile | |
| parent | 2d314810086684883329af730d8f5e8ecd0506b0 (diff) | |
| parent | 1a0bac8bccf0e156d2f3c5f14a7214f9677b6370 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Vagrantfile b/Vagrantfile index a6c3afd385..42b4377510 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,10 +5,10 @@ Vagrant.configure(2) do |config| # You can only have one config.vm.box uncommented at a time # Comment this and uncomment another if you don't want to use the minimal Arch box - config.vm.box = "dragon788/arch-ala-elasticdog" + #config.vm.box = "dragon788/arch-ala-elasticdog" # VMware/Virtualbox 64 bit - # config.vm.box = "phusion/ubuntu-14.04-amd64" + config.vm.box = "phusion/ubuntu-14.04-amd64" # # VMware/Virtualbox 64 bit #config.vm.box = "puphpet/centos65-x64" |