fix rebase errors, update package.json

mapbox · Nov 3, 2016 · 4ece0b2 · 4ece0b2
1 parent a5c179e
commit 4ece0b2
Show file tree

Hide file tree

Showing 4 changed files with 290 additions and 321 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();