Travis build: 592

README.md

@@ -2577,10 +2577,7 @@ Use `Math.max()` combined with the spread operator (`...`) to get the maximum va
 
 
 
-<<<<<<< HEAD
 
-=======
->>>>>>> master
 const max = (...arr) => Math.max(...[].concat(...arr);
 ```
 

docs/index.html

@@ -1220,10 +1220,7 @@ 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

snippets/max.md

@@ -9,6 +9,7 @@ Use `Math.max()` combined with the spread operator (`...`) to get the maximum va
 
 
 
+
 const max = (...arr) => Math.max(...[].concat(...arr);
 ```