From 1b879fc12d15d018f39e8359316af555669b47fe Mon Sep 17 00:00:00 2001 From: Valerio Virgillito Date: Tue, 17 Jul 2012 23:48:50 -0700 Subject: resolved a bad merge while removing comments. Signed-off-by: Valerio Virgillito --- js/ui/menu/menu-controller.js | 6 ------ 1 file changed, 6 deletions(-) (limited to 'js') 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, { 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)); } }, -- cgit v1.2.3