From: Angus Gratton <angus@espressif.com>
Date: Thu, 20 Jun 2019 07:02:49 +0000 (+0800)
Subject: Merge branch 'bugfix/pyparsing_v3.3' into 'release/v3.3'
X-Git-Tag: v3.3-rc~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04815c2d27e425d23799e3770006ee18cdc629ca;p=esp-idf

Merge branch 'bugfix/pyparsing_v3.3' into 'release/v3.3'

Temporarily fix incompatibility with pyparsing 2.4.0 (v3.3)

See merge request idf/esp-idf!5197
---

04815c2d27e425d23799e3770006ee18cdc629ca