Fix rebase

mapbox · Oct 31, 2016 · 42163bb · 42163bb
1 parent 5768796
commit 42163bb
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/js/util/script_detection.js b/js/util/script_detection.js
@@ -1,6 +1,5 @@
 'use strict';
 
-<<<<<<< HEAD
 module.exports.allowsIdeographicBreaking = function(chars) {
     for (const char of chars) {
         if (!exports.charAllowsIdeographicBreaking(char.charCodeAt(0))) {