Joris Tirado
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
submodules/devices/devices.js
|
|
|
@ -1040,7 +1040,7 @@ define(function(require) { |
|
|
|
return _.every([dest, src], _.isArray) ? src : undefined; |
|
|
|
} |
|
|
|
), |
|
|
|
mergedDevice = _.assign( |
|
|
|
mergedDevice = _.merge( |
|
|
|
{}, |
|
|
|
deviceData, |
|
|
|
deviceOverrides |
|
|
|
|