From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Fri, 10 Jan 2020 22:04:35 +0000 (-0800)
Subject: Resolving merge conflict
X-Git-Tag: 3.7.0^2~2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/ff954c5a6e7d600ade50f235a50dab31dacaa250?hp=ff954c5a6e7d600ade50f235a50dab31dacaa250

Resolving merge conflict
---