From 0505baff38529e86a04f9188b4a8a47520463450 Mon Sep 17 00:00:00 2001
From: Aircoookie <cschwinne@gmail.com>
Date: Sat, 8 Sep 2018 20:34:59 +0200
Subject: [PATCH] Resolve version code merge conflict

---
 wled00/wled00.ino | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wled00/wled00.ino b/wled00/wled00.ino
index 2ca913990..aa707fdd6 100644
--- a/wled00/wled00.ino
+++ b/wled00/wled00.ino
@@ -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";