resolve conflict

This commit is contained in:
soralee 2017-01-11 12:37:16 +09:00
parent 229ed372c3
commit 55b7ddc254

View file

@ -45,7 +45,7 @@ function HomeCtrl($scope, noteListDataFactory, websocketMsgSrv, $rootScope, arra
$scope.TRASH_FOLDER_ID = TRASH_FOLDER_ID;
$scope.query = {q: ''};
var initHome = function() {
$scope.initHome = function() {
websocketMsgSrv.getHomeNote();
vm.noteCustomHome = false;
};