From: adrianna <adrianna.pinska@gmail.com>
Date: Sat, 10 Sep 2016 10:47:05 +0000 (+0200)
Subject: merged display of multicoloured light into base class
X-Git-Tag: tabakrolletjie-v1.0.0~127^2
X-Git-Url: https://git.ctpug.org.za/?p=tabakrolletjie.git;a=commitdiff_plain;h=94e7e52ee8e1d79717a0c2e1d1889212a0b77470

merged display of multicoloured light into base class
---

diff --git a/data/stations/station-alpha.json b/data/stations/station-alpha.json
index 5df98c3..f0e27e5 100644
--- a/data/stations/station-alpha.json
+++ b/data/stations/station-alpha.json
@@ -42,7 +42,7 @@
       "intensity": 0.5
     },
     {
-      "type": "multicolourlamp",
+      "type": "lamp",
       "colours": ["red", "yellow", "green"],
       "position": [300, 300],
       "intensity": 0.5