diff options
author | Ananya Sen | 2012-06-19 11:00:49 -0700 |
---|---|---|
committer | Ananya Sen | 2012-06-19 11:00:49 -0700 |
commit | f1d8401aeb84e0eb0680caf72878dae26fd78a37 (patch) | |
tree | 31771ccaf3d1e2ddf01fa9605438d20be0d155d7 /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
parent | 9ea2610cec6569e7b7d5268b6c65bbf94c4753e5 (diff) | |
parent | 483ad57efcd6475776f580c3af5b60e6deeaf781 (diff) | |
download | ninja-f1d8401aeb84e0eb0680caf72878dae26fd78a37.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into cut-copy-paste
Diffstat (limited to 'js/components/treeview/ninja-branch.reel/ninja-branch.html')
-rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html index 60894fbc..8b808488 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.html +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html | |||
@@ -105,7 +105,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
105 | "properties": { | 105 | "properties": { |
106 | "element": { "#": "branchList" }, | 106 | "element": { "#": "branchList" }, |
107 | "contentController": {"@": "arrayController" }, | 107 | "contentController": {"@": "arrayController" }, |
108 | "selectionEnabled": true | 108 | "isSelectionEnabled": true |
109 | } | 109 | } |
110 | }, | 110 | }, |
111 | 111 | ||