diff --git a/README.md b/README.md index 7b71d68..f340f8b 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,11 @@ This is a fork of https://github.com/mongoose-os-apps/LilyGo-HiGrow-Sensor-v1.g Added MQTT and power saving features.

+<<<<<<< HEAD +======= + +>>>>>>> f2d8a6bd4d8e616986c098457889d866557164a3

## Differences