artifacts from rebase

mapbox · Aug 10, 2016 · 0e7cdbc · 0e7cdbc
1 parent b2316c5
commit 0e7cdbc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/js/symbol/glyph_atlas.js b/js/symbol/glyph_atlas.js
@@ -2,11 +2,7 @@
 
 var ShelfPack = require('shelf-pack');
 var util = require('../util/util');
-<<<<<<< ca46faab55edf3d1122fe92f338e39a951f90f77
 const GLYPH_ATLAS_DIM = 1024;
-=======
-const GLYPH_ATLAS_DIM = 2048;
->>>>>>> change array construction, cleanup
 //GLYPH_ATLAS_DIM are the maximum dimensions of the glyph atlas texture sheet
 
 module.exports = GlyphAtlas;