andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-08 08:49:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

ems+ merges

Browse Source
This commit is contained in:
proddy
2019-04-05 17:59:24 +02:00
parent 7d8d6dea24
commit d4037fdc34
8 changed files with 138 additions and 988 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/version.h
View File

@@ -5,12 +5,6 @@
#pragma once
<<<<<<< HEAD
#define APP_NAME "EMS-HEERENVEEN-1"
#define APP_VERSION "1.5.7b"
#define APP_HOSTNAME "ems-heerenveen-1"
=======
#define APP_NAME "EMS-ESP"
#define APP_VERSION "1.6.1b1"
#define APP_VERSION "1.7.0b2"
#define APP_HOSTNAME "ems-esp"
>>>>>>> upstream/dev