Merge branch 'menu-fixes' of github.com:mencio/ninja into menu-fixes

Conflicts:
	js/ui/menu/menu-controller.js

Signed-off-by: Valerio Virgillito <valerio@motorola.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/js/ui/menu/menu-controller.js b/js/ui/menu/menu-controller.js
index 3562a888..1bf8b8eb 100644
--- a/js/ui/menu/menu-controller.js
+++ b/js/ui/menu/menu-controller.js
@@ -113,6 +113,12 @@ exports.MenuController = Montage.create(Component, {
 
     toggleItem: {
         value: function(value) {
+<<<<<<< HEAD
+=======
+//            var f = value.substr(0, value.indexOf("-"));
+//            var c = value.slice(value.indexOf("-") + 1);
+
+>>>>>>> 8f78cb1377009dabde95f4a81d5090b79b9de0da
             this['handle' + value.substr(0, value.indexOf("-"))](value.slice(value.indexOf("-") + 1));
         }
     },