fixed merge conflict

SunJieMing · SunJieMing · commit 638d1d4fd4b5 · 2017-10-02T08:07:01.000-07:00
diff --git a/src/arrays.js b/src/arrays.js
@@ -54,6 +54,7 @@ const filter = (elements, cb) => {
 };
 
 /* Extra Credit */
+
 const flatten = (elements) => {
   // Flattens a nested array (the nesting can be to any depth).
   // Example: flatten([1, [2], [3, [[4]]]]); => [1, 2, 3, 4];
diff --git a/src/closure.js b/src/closure.js
@@ -36,6 +36,8 @@ const limitFunctionCallCount = (cb, n) => {
   };
 };
 
+/* Extra Credit */
+
 const cacheFunction = (cb) => {
   // Should return a funciton that invokes `cb`.
   // A cache (object) should be kept in closure scope.
