diff options
| author | Ananya Sen | 2012-02-17 14:26:56 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-17 14:26:56 -0800 |
| commit | 2980816130a44cd478b2a9d6606e021efbcebd4a (patch) | |
| tree | 762d98ba8852b858c03760f4b9bef294fae6486c /node_modules/montage/ui/toggle-switch.reel/toggle-switch.html | |
| parent | 96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff) | |
| parent | a42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff) | |
| download | ninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
css/ninja.css
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/montage/ui/toggle-switch.reel/toggle-switch.html')
| -rwxr-xr-x | node_modules/montage/ui/toggle-switch.reel/toggle-switch.html | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/node_modules/montage/ui/toggle-switch.reel/toggle-switch.html b/node_modules/montage/ui/toggle-switch.reel/toggle-switch.html deleted file mode 100755 index 2aef4a59..00000000 --- a/node_modules/montage/ui/toggle-switch.reel/toggle-switch.html +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | <!DOCTYPE html> | ||
| 2 | <!-- <copyright> | ||
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | ||
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | ||
| 5 | (c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved. | ||
| 6 | </copyright> --> | ||
| 7 | <html> | ||
| 8 | <head> | ||
| 9 | <title></title> | ||
| 10 | <link rel="stylesheet" type="text/css" href="toggle-switch.css"> | ||
| 11 | |||
| 12 | </head> | ||
| 13 | <body> | ||
| 14 | |||
| 15 | </body> | ||
| 16 | </html> | ||