aboutsummaryrefslogtreecommitdiff
path: root/js/components/ui/icon-list-basic/iconsList.reel
diff options
context:
space:
mode:
authorJon Reid2012-05-04 14:56:24 -0700
committerJon Reid2012-05-04 14:56:24 -0700
commita6dd2917edcfeca1be7553e03281ddd538422ae1 (patch)
treee6846626bf1e967e80bcd652f6a76bb97abb1789 /js/components/ui/icon-list-basic/iconsList.reel
parent7fc185cc08b2ba912dbc7bce96f6a465c1dd6dbf (diff)
parent8964e070fa760d23c2de272ca36b8d9beba6007d (diff)
downloadninja-a6dd2917edcfeca1be7553e03281ddd538422ae1.tar.gz
Merge remote-tracking branch 'ninja-jduran/TimelineUber' into timeline-local
Diffstat (limited to 'js/components/ui/icon-list-basic/iconsList.reel')
-rwxr-xr-xjs/components/ui/icon-list-basic/iconsList.reel/iconsList.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 35260527..05d3ea7d 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -55,9 +55,9 @@
55 </script> 55 </script>
56</head> 56</head>
57<body> 57<body>
58<div id="list" class="list"> 58<div data-montage-id="list" class="list">
59 <div id="iconsView"> 59 <div data-montage-id="iconsView">
60 <div id="icon"></div> 60 <div data-montage-id="icon"></div>
61 </div> 61 </div>
62</div> 62</div>
63</body> 63</body>