From c48da9b5cf57f1d9e84a4cad7f392a81bf9ab2f8 Mon Sep 17 00:00:00 2001
From: carl bergquist <carl.bergquist@gmail.com>
Date: Tue, 15 Dec 2015 14:03:15 +0100
Subject: [PATCH] fix(tests): fix broken unittest due to merge conflict

---
 public/app/features/dashboard/rowCtrl.js | 1 -
 public/test/specs/row-ctrl-specs.js      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/public/app/features/dashboard/rowCtrl.js b/public/app/features/dashboard/rowCtrl.js
index 7fbf54b5f83..3b178c4de26 100644
--- a/public/app/features/dashboard/rowCtrl.js
+++ b/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);
diff --git a/public/test/specs/row-ctrl-specs.js b/public/test/specs/row-ctrl-specs.js
index 33130b93eac..06aa92e783a 100644
--- a/public/test/specs/row-ctrl-specs.js
+++ b/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 () {