aboutsummaryrefslogtreecommitdiffstats
path: root/Vagrantfile
diff options
context:
space:
mode:
authorJason Janse van Rensburg <l33tjas.0n@gmail.com>2016-08-30 14:54:00 +0200
committerJason Janse van Rensburg <l33tjas.0n@gmail.com>2016-08-30 14:54:00 +0200
commitfc2ca62a3b9552175eb7c27cc11f3a5af6cfae50 (patch)
tree59b2f2406f472a9fd2af4946420d1a1c880929c0 /Vagrantfile
parenta41a7a9100b9f4c6bfdf49b39b05e626ffd95397 (diff)
parent8e00c464e6f488d86e0768a77a2ad5ee238dba6d (diff)
downloadfirmware-fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50.tar.gz
firmware-fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50.tar.bz2
firmware-fc2ca62a3b9552175eb7c27cc11f3a5af6cfae50.zip
Merge branch 'master'
Conflicts: keyboards/planck/keymaps/bone2planck/keymap.c
Diffstat (limited to 'Vagrantfile')
-rw-r--r--Vagrantfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Vagrantfile b/Vagrantfile
index 8cadeaddf..389b688ae 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -91,7 +91,7 @@ Vagrant.configure(2) do |config|
Or you can copy and paste the example line below.
- cd /vagrant; cd keyboards; cd ergodox_ez; make clean; make
+ cd /vagrant; cd keyboards; cd ergodox; make clean; make
EOT