doc

coderaiser · Jan 10, 2017 · c1d53b2 · c1d53b2
1 parent de58951
commit c1d53b2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/lib/readify.js b/lib/readify.js
@@ -33,10 +33,7 @@ const readdir = promisify(fs.readdir, fs);
 /* sorting on Win and node v0.8.0 */
 const sortFiles = sort((a, b) => {
     // use accent friendly function
-<<<<<<< HEAD
     // http://www.jstips.co/en/sorting-strings-with-accented-characters/
-=======
->>>>>>> 1b9e64ced76f2f6048d860cf7fd9e39132cea1e3
     return a.name.localeCompare(b.name);
 });