Comparing version 0.7.0 to 0.8.0
@@ -380,2 +380,5 @@ (function (global, factory) { | ||
/** | ||
* Merges all own properties of the first object into the second. | ||
*/ | ||
var merge = _curry2(function merge (a, b) { | ||
@@ -385,2 +388,7 @@ var y = {} | ||
for (prop in b) { | ||
if (b.hasOwnProperty(prop)) { | ||
y[prop] = b[prop] | ||
} | ||
} | ||
for (prop in a) { | ||
@@ -391,7 +399,2 @@ if (a.hasOwnProperty(prop)) { | ||
} | ||
for (prop in b) { | ||
if (b.hasOwnProperty(prop)) { | ||
y[prop] = b[prop] | ||
} | ||
} | ||
return y | ||
@@ -398,0 +401,0 @@ }) |
{ | ||
"name": "redash", | ||
"version": "0.7.0", | ||
"version": "0.8.0", | ||
"description": "", | ||
@@ -5,0 +5,0 @@ "main": "dist/redash.js", |
15197
543