From: Melissa LeBlanc-Williams <melissa@adafruit.com>
Date: Thu, 16 Apr 2020 15:37:06 +0000 (-0700)
Subject: fix merge conflict in branch
X-Git-Tag: 4.5.0~1^2~2
X-Git-Url: https://git.ayoreis.com/Adafruit_Blinka-hackapet.git/commitdiff_plain/51df1333e19ee8a3ad5832385e215bf4f2ecabcb?hp=51df1333e19ee8a3ad5832385e215bf4f2ecabcb

fix merge conflict in branch
---