Merge branch 'localized_sort' of github.com:quazardous/readify into

localized_sort # Conflicts: # lib/readify.js
coderaiser · Jan 10, 2017 · de58951 · de58951
2 parents 7798d91 + 1b9e64c
commit de58951
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/lib/readify.js b/lib/readify.js
@@ -33,7 +33,10 @@ 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);
 });