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 /js/panels/css-panel/rule-components | |
| 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 'js/panels/css-panel/rule-components')
| -rw-r--r-- | js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html index 8b0c3101..99021917 100644 --- a/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html +++ b/js/panels/css-panel/rule-components/css-style-rule.reel/css-style-rule.html | |||
| @@ -49,7 +49,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 49 | } | 49 | } |
| 50 | }, | 50 | }, |
| 51 | "sheetLink": { | 51 | "sheetLink": { |
| 52 | "prototype": "montage/ui/anchor.reel", | 52 | "prototype": "montage/ui/native/anchor.reel", |
| 53 | "properties": { | 53 | "properties": { |
| 54 | "element": {"#": "style-sheet-name"} | 54 | "element": {"#": "style-sheet-name"} |
| 55 | } | 55 | } |