Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed leftover merge conflict artifact

Browse Source
This commit is contained in:
Julian Lam
2017-03-15 10:23:25 -04:00
parent 1ebbbdd3f9
commit 250bb4b011
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/src/admin/general/dashboard.js
View File

@@ -307,12 +307,9 @@ define('admin/general/dashboard', ['semver', 'Chart', 'translator'], function (s
$(this).addClass('active'); $(this).addClass('active');
}); });
<<<<<<< HEAD
socket.emit('admin.rooms.getAll', Admin.updateRoomUsage); socket.emit('admin.rooms.getAll', Admin.updateRoomUsage);
initiateDashboard(); initiateDashboard();
=======
callback(); callback();
>>>>>>> origin/master
}); });
} }