cgiflash.c: Remove conflict markers and re-enable calling esp32flashSetOtaAsCurrentImage()
cgiflash.c: Remove conflict markers and re-enable calling esp32flashSetOtaAsCurrentImage()

chmorgan/libesphttpd