search

G6EJD / ESP32-e-Paper-Weather-Display

An ESP32 and 2.9", 4.2" or 7.5" ePaper Display reads Weather Underground data via their API and then displays the weather
Other
978 stars 207 forks source link

Merge conflict committed to repo? #111

Closed john-- closed 4 years ago

john-- commented 4 years ago

Looks like you might have committed a merge conflict here:

https://github.com/G6EJD/ESP32-e-Paper-Weather-Display/blob/7acb28dfca717c75ce7292a070d10966038f9e43/examples/Waveshare_7_5/Waveshare_7_5.ino#L76

G6EJD commented 4 years ago

Interesting, it’s not showing me any conflicts, this happened a few days ago, but I can’t see why or how, I’ll correct it manually

G6EJD commented 4 years ago

Thanks

john-- commented 4 years ago

Well that was fast! Thanks!