diff options
| author | Ananya Sen | 2012-06-26 16:07:00 -0700 |
|---|---|---|
| committer | Ananya Sen | 2012-06-26 16:07:00 -0700 |
| commit | 1d5372534d11c9c1b818ba5e7d67498c731e9ac6 (patch) | |
| tree | bc09c9f08ac2faa955995a91a78337276a81eb77 /node_modules/labs/rich-text-editor.reel/rich-text-editor.html | |
| parent | 3391a8e6fd5df0d464edaffd98c2b3fde23acf5a (diff) | |
| parent | 46174eb0ce93d660c8d2e9276fbdc4f9a03f056a (diff) | |
| download | ninja-1d5372534d11c9c1b818ba5e7d67498c731e9ac6.tar.gz | |
Merge branch 'refs/heads/ninja-internal-master' into bugfix-master
Conflicts:
js/ninja.reel/ninja.html
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'node_modules/labs/rich-text-editor.reel/rich-text-editor.html')
| -rw-r--r-- | node_modules/labs/rich-text-editor.reel/rich-text-editor.html | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/node_modules/labs/rich-text-editor.reel/rich-text-editor.html b/node_modules/labs/rich-text-editor.reel/rich-text-editor.html deleted file mode 100644 index 42425b40..00000000 --- a/node_modules/labs/rich-text-editor.reel/rich-text-editor.html +++ /dev/null | |||
| @@ -1,27 +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="rich-text-editor.css"> | ||
| 11 | <script type="text/montage-serialization"> | ||
| 12 | { | ||
| 13 | "owner": { | ||
| 14 | "module": "node_modules/labs/rich-text-editor.reel", | ||
| 15 | "name": "RichTextEditor", | ||
| 16 | "properties": { | ||
| 17 | |||
| 18 | } | ||
| 19 | } | ||
| 20 | } | ||
| 21 | </script> | ||
| 22 | |||
| 23 | </head> | ||
| 24 | <body> | ||
| 25 | </body> | ||
| 26 | </html> | ||
| 27 | \ No newline at end of file | ||