From ac941e5ab3251c8b6b277195c3e511d5bdcaf1b9 Mon Sep 17 00:00:00 2001 From: proddy Date: Wed, 2 Jan 2019 00:22:13 +0100 Subject: [PATCH] Version 1.2.0 --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index f73503f63..6069e4388 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,8 @@ EMS-ESP-Boiler is a project to build a controller circuit running with an ESP826 There are 3 parts to this project, first the design of the circuit, second the code for the ESP8266 microcontroller firmware and lastly an example configuration for Home Assistant to monitor the data and issue direct commands via MQTT. -<<<<<<< HEAD -[![version](https://img.shields.io/badge/version-1.1.2-brightgreen.svg)](CHANGELOG.md) -======= [![Codacy Badge](https://api.codacy.com/project/badge/Grade/b8880625bdf841d4adb2829732030887)](https://app.codacy.com/app/proddy/EMS-ESP-Boiler?utm_source=github.com&utm_medium=referral&utm_content=proddy/EMS-ESP-Boiler&utm_campaign=Badge_Grade_Settings) [![version](https://img.shields.io/badge/version-1.1.0-brightgreen.svg)](CHANGELOG.md) ->>>>>>> 53b7531bddff62a32f4dbd8cf4fa655e65215554 - [EMS-ESP-Boiler](#ems-esp-boiler) - [Introduction](#introduction)