riley being anal

This commit is contained in:
Riley Davis committed 2016-12-08 12:51:45 -10:00
1 parent 4572d8e68e
commit 500dafbafa
2 files changed
+2 -2

No files matched your search

+1 -1
View File
@@ -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
+1 -1
View File
@@ -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) => {