Merge branch 'master' of github.com:iot-lab/iot-lab

Conflicts: web-view3D/README.md web-view3D/app.js
iot-lab · Oct 7, 2015 · 4204a04 · 4204a04
2 parents 9ed4701 + 97e1b0e
commit 4204a04
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/web-view3D/README.md b/web-view3D/README.md
@@ -16,7 +16,6 @@ Prerequisites
 Run
 ---
 0. You need a running experiment.
-
 1. Run `serial_aggregator` on testbed site ssh frontend as tcp server:
 ```sh
 socat tcp-listen:9000,fork,reuseaddr exec:'ssh <user>@<site>.iot-lab.info "serial_aggregator -i <experiment id>"'