fix(tests): fix broken unittest due to merge conflict

public/app/features/dashboard/rowCtrl.js

@@ -41,7 +41,6 @@ function (angular, _, config) {
       $scope.dashboard.addPanel(panel, $scope.row);
     };
 
-
     $scope.deleteRow = function() {
       function delete_row() {
         $scope.dashboard.rows = _.without($scope.dashboard.rows, $scope.row);

public/test/specs/row-ctrl-specs.js

@@ -19,7 +19,7 @@ define([
           ctx.scope.row = ctx.scope.dashboard.rows[0];
           ctx.scope.appEvent = sinon.spy();
 
-          ctx.scope.delete_row();
+          ctx.scope.deleteRow();
         });
 
         it('should NOT ask for confirmation', function () {