diff options
| author | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-06-20 15:16:30 -0700 |
| commit | 65b989c7759af923fb9456d34bff89f91831ea1e (patch) | |
| tree | e408be732a3eee71229bfc7dbf7cace998ce18de /node_modules/montage/ui/bluemoon/slider.reel/slider.html | |
| parent | 38f571d1fdf02d36c3816637af7b2ca2493809da (diff) | |
| parent | fc818d31de267d2b77fda3b3029ad38d48698be8 (diff) | |
| download | ninja-65b989c7759af923fb9456d34bff89f91831ea1e.tar.gz | |
Merge branch 'refs/heads/master' into binding
Conflicts:
node_modules/montage/ui/application.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/bluemoon/slider.reel/slider.html')
| -rw-r--r-- | node_modules/montage/ui/bluemoon/slider.reel/slider.html | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/node_modules/montage/ui/bluemoon/slider.reel/slider.html b/node_modules/montage/ui/bluemoon/slider.reel/slider.html index e80a520e..1671d0c2 100644 --- a/node_modules/montage/ui/bluemoon/slider.reel/slider.html +++ b/node_modules/montage/ui/bluemoon/slider.reel/slider.html | |||
| @@ -6,8 +6,8 @@ | |||
| 6 | </copyright> --> | 6 | </copyright> --> |
| 7 | <html> | 7 | <html> |
| 8 | <head> | 8 | <head> |
| 9 | <title></title> | 9 | <meta charset="utf-8"> |
| 10 | <link rel="stylesheet" type="text/css" href="slider.css"> | 10 | <link rel="stylesheet" href="slider.css"> |
| 11 | <script type="text/montage-serialization"> | 11 | <script type="text/montage-serialization"> |
| 12 | { | 12 | { |
| 13 | "owner": { | 13 | "owner": { |
| @@ -53,7 +53,6 @@ | |||
| 53 | } | 53 | } |
| 54 | } | 54 | } |
| 55 | </script> | 55 | </script> |
| 56 | |||
| 57 | </head> | 56 | </head> |
| 58 | <body> | 57 | <body> |
| 59 | <div data-montage-id="slider" class="montage-slider"> | 58 | <div data-montage-id="slider" class="montage-slider"> |
| @@ -78,4 +77,4 @@ | |||
| 78 | </div> | 77 | </div> |
| 79 | </div> | 78 | </div> |
| 80 | </body> | 79 | </body> |
| 81 | </html> | 80 | </html> \ No newline at end of file |