aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValerio Virgillito2012-07-17 23:48:50 -0700
committerValerio Virgillito2012-07-17 23:48:50 -0700
commit1b879fc12d15d018f39e8359316af555669b47fe (patch)
tree8bb7a58b5fa41e7e0e8fc8b847519a7b4d40f4ca
parent0cef3e553689005cb3a12b43bee26ecf75d9ad61 (diff)
downloadninja-1b879fc12d15d018f39e8359316af555669b47fe.tar.gz
resolved a bad merge while removing comments.
Signed-off-by: Valerio Virgillito <valerio@motorola.com>
-rw-r--r--js/ui/menu/menu-controller.js6
1 files changed, 0 insertions, 6 deletions
diff --git a/js/ui/menu/menu-controller.js b/js/ui/menu/menu-controller.js
index 1bf8b8eb..3562a888 100644
--- a/js/ui/menu/menu-controller.js
+++ b/js/ui/menu/menu-controller.js
@@ -113,12 +113,6 @@ exports.MenuController = Montage.create(Component, {
113 113
114 toggleItem: { 114 toggleItem: {
115 value: function(value) { 115 value: function(value) {
116<<<<<<< HEAD
117=======
118// var f = value.substr(0, value.indexOf("-"));
119// var c = value.slice(value.indexOf("-") + 1);
120
121>>>>>>> 8f78cb1377009dabde95f4a81d5090b79b9de0da
122 this['handle' + value.substr(0, value.indexOf("-"))](value.slice(value.indexOf("-") + 1)); 116 this['handle' + value.substr(0, value.indexOf("-"))](value.slice(value.indexOf("-") + 1));
123 } 117 }
124 }, 118 },