aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data
diff options
context:
space:
mode:
authorJon Reid2012-06-28 09:51:33 -0700
committerJon Reid2012-06-28 09:51:33 -0700
commit8780f4be63bac964d23939127298f6334f482cdf (patch)
tree197ffef1e31f60f3dc8ddb23a36f263f65c32a9f /node_modules/components-data
parentb50b720e7b34cea86e9aabfb27e843376508b00e (diff)
parent7e098b5a710776439ca6ad00604e2f2011dbc4ed (diff)
downloadninja-8780f4be63bac964d23939127298f6334f482cdf.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js Used Theirs, doesn't matter, code block is in commented-out section.
Diffstat (limited to 'node_modules/components-data')
-rw-r--r--node_modules/components-data/map.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/map.json b/node_modules/components-data/map.json
index e80fa510..4a3da3c6 100644
--- a/node_modules/components-data/map.json
+++ b/node_modules/components-data/map.json
@@ -10,7 +10,7 @@
10 "name": "category", 10 "name": "category",
11 "type": "select", 11 "type": "select",
12 "default": "restaurant", 12 "default": "restaurant",
13 "possibleValues": ["restaurant", "hospital", "cafe", "museum"] 13 "possibleValues": ["", "restaurant", "hospital", "cafe", "museum"]
14 }, 14 },
15 { 15 {
16 "name": "center", 16 "name": "center",