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

Merged changes for the new dev

Browse Source
This commit is contained in:
Glenn Arens
2019-04-05 12:01:13 +02:00
parent bf5165f446 b31f3118d1
commit 36494d9e6b
20 changed files with 1939 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/version.h
View File

@@ -5,6 +5,12 @@
#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_HOSTNAME "ems-esp"
>>>>>>> upstream/dev