From 1a9b410540f59f8af10786260b960a4d8ea14143 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Tue, 23 Jul 2019 11:14:40 +0200
Subject: [PATCH] Update to master branch

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6e509efa..dcfb006b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4040,8 +4040,8 @@
       "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU="
     },
     "windshaft": {
-      "version": "github:cartodb/windshaft#101e3a5093c834262381fad768a37b0a1e24de4a",
-      "from": "github:cartodb/windshaft#fix-windshaft-cartodb-assertion",
+      "version": "github:cartodb/windshaft#83a3d1cbc0456f124bda29ce1b18fce9d59c7d81",
+      "from": "github:cartodb/windshaft#master",
       "requires": {
         "@carto/cartonik": "^0.6.1",
         "@carto/mapnik": "3.6.2-carto.16",
diff --git a/package.json b/package.json
index 3bda019a..3e4eb766 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "step-profiler": "0.3.0",
     "turbo-carto": "0.21.2",
     "underscore": "1.6.0",
-    "windshaft": "github:cartodb/windshaft#fix-windshaft-cartodb-assertion",
+    "windshaft": "github:cartodb/windshaft#master",
     "yargs": "11.1.0"
   },
   "devDependencies": {