Resolve version code merge conflict

This commit is contained in:
Aircoookie 2018-09-08 20:34:59 +02:00 committed by GitHub
parent 95083cf743
commit 0505baff38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -39,8 +39,8 @@
#include "src/dependencies/e131/E131.h"
//version in format yymmddb (b = daily build)
#define VERSION 1808311
char versionString[] = "0.7.1";
#define VERSION 1809084
char versionString[] = "0.8.0-a";
//AP and OTA default passwords (change them!)
char apPass[65] = "wled1234";