Merge remote-tracking branch 'origin/master'

2017-12-29 15:12:04 +02:00
parent 407bb49753 225ccb9433
commit 239f76f392
3 changed files with 10 additions and 0 deletions
--- a/README.md
+++ b/README.md
@ -2577,7 +2577,10 @@ Use `Math.max()` combined with the spread operator (`...`) to get the maximum va



+<<<<<<< HEAD

+=======
+>>>>>>> master
 const max = (...arr) => Math.max(...[].concat(...arr);
 ```