Messages in this thread | | | Date | Wed, 29 Jul 2020 18:56:22 +0200 | From | Sebastian Reichel <> | Subject | Re: [PATCH v5 2/4] power: supply: bq27xxx_battery: Add the BQ27z561 Battery monitor |
| |
Hi,
On Wed, Jul 29, 2020 at 10:55:54AM -0500, Dan Murphy wrote: > > +<<<<<<< HEAD > > Need to remove this artifact from a rebase. > > Not sure how this got here as it does not appear in my source.
You don't see it in your source, since you removed it in patch 4.
-- Sebastian [unhandled content-type:application/pgp-signature] | |