Resolve version code merge conflict
This commit is contained in:
parent
95083cf743
commit
0505baff38
@ -39,8 +39,8 @@
|
|||||||
#include "src/dependencies/e131/E131.h"
|
#include "src/dependencies/e131/E131.h"
|
||||||
|
|
||||||
//version in format yymmddb (b = daily build)
|
//version in format yymmddb (b = daily build)
|
||||||
#define VERSION 1808311
|
#define VERSION 1809084
|
||||||
char versionString[] = "0.7.1";
|
char versionString[] = "0.8.0-a";
|
||||||
|
|
||||||
//AP and OTA default passwords (change them!)
|
//AP and OTA default passwords (change them!)
|
||||||
char apPass[65] = "wled1234";
|
char apPass[65] = "wled1234";
|
||||||
|
Loading…
Reference in New Issue
Block a user