🎉 Release of ESP32Doorbell 0.0.1

README.md

@@ -78,7 +78,6 @@ check [the contributor's page][contributors].
 [commits]: https://github.com/marrobHD/ESP32Doorbell/commits/master
 [discord]: https://discord.gg/ND4emRS
 [discord-shield]: https://img.shields.io/discord/579704220970909717.svg?style=for-the-badge
-<<<<<<< HEAD
 [contributors]: https://github.com/marrobHD/ESP32Doorbell/graphs/contributors
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg?style=for-the-badge
 [license-shield]: https://img.shields.io/github/license/marrobHD/ESP32Doorbell.svg?style=for-the-badge
@@ -87,13 +86,11 @@ check [the contributor's page][contributors].
 [releases-shield]: https://img.shields.io/github/release/marrobHD/ESP32Doorbell.svg?style=for-the-badge
 [releases]: https://github.com/marrobHD/ESP32Doorbell/releases
 [esphome]: https://esphome.io
-=======
 [contributors]: https://github.com/hassio-addons/addon-ssh/graphs/contributors
 [forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg?style=for-the-badge
 [license-shield]: https://img.shields.io/github/license/marrobHD/ESP32Doorbell.svg?style=for-the-badge
 [maintenance-shield]: https://img.shields.io/badge/maintainer-marrobHD-blue.svg?style=for-the-badge
 [releases-shield]: https://img.shields.io/github/release/marrobHD/ESP32Doorbell.svg?style=for-the-badge
 [releases]: https://github.com/marrobHD/ESP32Doorbell/releases
->>>>>>> 7e6454f637698d3694abd5c6b57b8601450a1cce
 [twitter]: https://img.shields.io/twitter/follow/mar_robHD.svg?style=social
 [github]: https://img.shields.io/github/followers/marrobHD.svg?style=social