aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/ninja-branch.reel/ninja-branch.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /js/components/treeview/ninja-branch.reel/ninja-branch.html
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
Diffstat (limited to 'js/components/treeview/ninja-branch.reel/ninja-branch.html')
-rw-r--r--js/components/treeview/ninja-branch.reel/ninja-branch.html2
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