Merge remote-tracking branch 'origin/master'

2017-12-29 15:12:04 +02:00
parent 0520c8b866 decfedd811
commit f01a8b1a0e
3 changed files with 10 additions and 0 deletions
--- a/docs/index.html
+++ b/docs/index.html
@ -1220,7 +1220,10 @@ lcm([1, 3, 4], 5); // 60



+<<<<<<< HEAD

+=======
+>>>>>>> master
 const max = (...arr) =&gt; Math.max(...[].concat(...arr);
 </code></pre>
 <pre><code class="language-js">max([10, 1, 5]); // 10