Closed john-- closed 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
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
Thanks
Well that was fast! Thanks!
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