fixed leftover merge conflict artifact

8 years ago · 250bb4b011
parent 1ebbbdd3f9
commit 250bb4b011
1 changed files with 0 additions and 3 deletions
--- 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
 		});
 	}