Fix automatic merge gone wrong
This commit is contained in:
@@ -168,12 +168,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
deferred.resolve(groupedTours);
|
||||
});
|
||||
return deferred.promise;
|
||||
}
|
||||
});
|
||||
|
||||
/**
|
||||
* @ngdoc method
|
||||
|
||||
Reference in New Issue
Block a user