From 6ce01769e9eabee3894139ae12bb9e98cf8285d7 Mon Sep 17 00:00:00 2001
From: Travis CI <travis@travis-ci.org>
Date: Fri, 29 Dec 2017 13:13:29 +0000
Subject: [PATCH] Travis build: 592

---
 README.md       | 3 ---
 docs/index.html | 3 ---
 snippets/max.md | 1 +
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 0ca93513d..5ac9636ec 100644
--- a/README.md
+++ b/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);
 ```
 
diff --git a/docs/index.html b/docs/index.html
index e3b5151f4..b747f7bc9 100644
--- a/docs/index.html
+++ b/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
diff --git a/snippets/max.md b/snippets/max.md
index 0fe2586b7..7ba4ad2f1 100644
--- a/snippets/max.md
+++ b/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);
 ```