fix rebase errors, update package.json

mapbox · Nov 7, 2016 · dd51219 · dd51219
1 parent 0a37e12
commit dd51219
Show file tree

Hide file tree

Showing 4 changed files with 291 additions and 322 deletions.
diff --git a/js/data/array_group.js b/js/data/array_group.js
@@ -34,7 +34,6 @@ class Segment {
 class ArrayGroup {
     constructor(programInterface, layers, zoom) {
         this.globalProperties = {zoom};
-
         const LayoutVertexArrayType = programInterface.layoutVertexArrayType;
         this.layoutVertexArray = new LayoutVertexArrayType();