From 250bb4b0111b6e8d443f7f8268b0183f2dcafb97 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 15 Mar 2017 10:23:25 -0400
Subject: [PATCH] fixed leftover merge conflict artifact

---
 public/src/admin/general/dashboard.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/public/src/admin/general/dashboard.js b/public/src/admin/general/dashboard.js
index 38d324cbcd..71ad4e3738 100644
--- a/public/src/admin/general/dashboard.js
+++ b/public/src/admin/general/dashboard.js
@@ -307,12 +307,9 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
 				$(this).addClass('active');
 			});
 
-<<<<<<< HEAD
 			socket.emit('admin.rooms.getAll', Admin.updateRoomUsage);
 			initiateDashboard();
-=======
 			callback();
->>>>>>> origin/master
 		});
 	}