mirror of
https://github.com/wassname/talk.git
synced 2026-07-12 15:17:35 +08:00
riley being anal
This commit is contained in:
@@ -38,7 +38,7 @@ module.exports = (req, res, next) => {
|
||||
|
||||
} else if (typeof o === 'object') {
|
||||
|
||||
// Itterate over the props, find only properties owned by the object.
|
||||
// Iterate over the props, find only properties owned by the object.
|
||||
for (let prop in o) {
|
||||
|
||||
// If and only if the object owns the property do we actually pull the
|
||||
|
||||
@@ -41,7 +41,7 @@ describe('models.Setting', () => {
|
||||
});
|
||||
|
||||
describe('#merge', () => {
|
||||
it('should merge a settings object and it\'s overrides', () => {
|
||||
it('should merge a settings object and its overrides', () => {
|
||||
return Setting
|
||||
.retrieve()
|
||||
.then((settings) => {
|
||||
|
||||
Reference in New Issue
Block a user