From 6e13fc019f0a3ffc30b0ba5e62dbd5ad2e0eaf05 Mon Sep 17 00:00:00 2001
From: Scott Allen <saydisp-git@yahoo.ca>
Date: Thu, 13 Apr 2017 20:44:49 -0400
Subject: [PATCH] Remove extra 50ms delay added by de1725

by Josh Goebel.
Merge conflict resolved.
---
 src/Arduboy2.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Arduboy2.cpp b/src/Arduboy2.cpp
index b201a33..ff5ac46 100644
--- a/src/Arduboy2.cpp
+++ b/src/Arduboy2.cpp
@@ -169,7 +169,7 @@ void Arduboy2Base::bootLogoShell(void (*drawLogo)(int16_t))
     }
   }
 
-  delay(750);
+  delay(700);
   digitalWriteRGB(BLUE_LED, RGB_OFF);
 
   bootLogoExtra();
@@ -1021,7 +1021,6 @@ void Arduboy2Base::writeUnitName(char* name)
     EEPROM.update(dest, done ? 0x00 : name[src]);
     dest++;
   }
-
 }
 
 bool Arduboy2Base::readShowUnitNameFlag()