Fix merge conflict in News.js

css/news.css

@@ -26,4 +26,3 @@ li.folder_list:hover { color: rgb(0, 0, 0) !important; background: none !importa
 li.feeds_list:hover { background: none repeat scroll 0% 0% rgb(221, 221, 221) !important; }
 div.collapsable:hover { background-color: rgb(221, 221, 221); }
 
-li { padding-right: 0px !important; }

js/news.js

@@ -151,21 +151,15 @@ $(document).ready(function(){
 		return false;
 	}).next().hide();
 
+        var list = $('.collapsable,.feeds_list').hover(function() {
+                var elem = $(this).find('#feeds_delete,#feeds_edit');
+                if(elem.css('display') == 'none')
+                        elem.css('display', 'inline');
+                else
+                        elem.css('display', 'none');
 
-	$('.feeds_list').hover(function() {
-		$(this).find('#feeds_delete').toggle();
-
-		var list = $('.collapsable,.feeds_list').hover(function() {
-
-		var elem = $(this).find('#feeds_delete,#feeds_edit');
-		if(elem.css('display') == 'none')
-			elem.css('display', 'inline');
-		else
-			elem.css('display', 'none');
-
-		return false;
-	});
-
-	list.find('#feeds_delete').hide();
-	list.find('#feeds_edit').hide();
+                return false;
+        });
+        list.find('#feeds_delete').hide();
+        list.find('#feeds_edit').hide();
 });