Fix broken geom types after solving conflicts #2047
Fix broken geom types after solving conflicts #2047

bloomberg/cartodb,UCL-ShippingGroup/cartodb-1,codeandtheory/cartodb,future-analytics/cartodb,DigitalCoder/cartodb,future-analytics/cartodb,dbirchak/cartodb,dbirchak/cartodb,dbirchak/cartodb,CartoDB/cartodb,thorncp/cartodb,UCL-ShippingGroup/cartodb-1,CartoDB/cartodb,thorncp/cartodb,bloomberg/cartodb,raquel-ucl/cartodb,CartoDB/cartodb,splashblot/dronedb,nuxcode/cartodb,splashblot/dronedb,raquel-ucl/cartodb,UCL-ShippingGroup/cartodb-1,codeandtheory/cartodb,nyimbi/cartodb,UCL-ShippingGroup/cartodb-1,DigitalCoder/cartodb,splashblot/dronedb,future-analytics/cartodb,DigitalCoder/cartodb,future-analytics/cartodb,CartoDB/cartodb,UCL-ShippingGroup/cartodb-1,splashblot/dronedb,splashblot/dronedb,nuxcode/cartodb,raquel-ucl/cartodb,DigitalCoder/cartodb,thorncp/cartodb,nuxcode/cartodb,nuxcode/cartodb,raquel-ucl/cartodb,nyimbi/cartodb,codeandtheory/cartodb,dbirchak/cartodb,DigitalCoder/cartodb,future-analytics/cartodb,thorncp/cartodb,codeandtheory/cartodb,raquel-ucl/cartodb,CartoDB/cartodb,bloomberg/cartodb,nyimbi/cartodb,bloomberg/cartodb,nyimbi/cartodb,nuxcode/cartodb,thorncp/cartodb,bloomberg/cartodb,codeandtheory/cartodb,dbirchak/cartodb,nyimbi/cartodb