diff options
author | Eric Guzman | 2012-06-19 01:20:36 -0700 |
---|---|---|
committer | Eric Guzman | 2012-06-19 01:20:36 -0700 |
commit | 2ef72cdf0e59fb3623a2c13251ac707522f3dc5a (patch) | |
tree | f69f4e3de7e4441311ef2b38770e0ce26067aac4 /node_modules/montage-google/map.reel/map.html | |
parent | 5260d3dfd99d79924c4aaa3ab798e90c7d328d7d (diff) | |
parent | 1007cbf983ad0f2460a4122a492a96023fdb4439 (diff) | |
download | ninja-2ef72cdf0e59fb3623a2c13251ac707522f3dc5a.tar.gz |
Merge branch 'binding' of github.com:dhg637/ninja-internal into binding
Conflicts:
js/stage/binding-view.reel/binding-view.js
Diffstat (limited to 'node_modules/montage-google/map.reel/map.html')
-rw-r--r-- | node_modules/montage-google/map.reel/map.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/montage-google/map.reel/map.html b/node_modules/montage-google/map.reel/map.html index fee3a38e..bd41f47e 100644 --- a/node_modules/montage-google/map.reel/map.html +++ b/node_modules/montage-google/map.reel/map.html | |||
@@ -15,7 +15,7 @@ | |||
15 | { | 15 | { |
16 | 16 | ||
17 | "owner": { | 17 | "owner": { |
18 | "prototype": "montage-google/map.reel", | 18 | "prototype": "map.reel", |
19 | "properties": { | 19 | "properties": { |
20 | "element": {"#": "map-container"}, | 20 | "element": {"#": "map-container"}, |
21 | "mapEl": {"#": "map"} | 21 | "mapEl": {"#": "map"} |