From 9eae4ddecd2913a6e8e735537c3ae9b41e01fad3 Mon Sep 17 00:00:00 2001
From: Thilo Graf <dbt@novatux.de>
Date: Wed, 3 Oct 2018 11:36:41 +0200
Subject: [PATCH] src/neutrino.cpp: fix rebase error

---
 src/neutrino.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index 7b07941d6..cb2749794 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2475,7 +2475,7 @@ TIMER_START();
 	g_videoSettings = new CVideoSettings;
 	g_videoSettings->setVideoSettings();
 
-	frameBuffer->showFrame(LOGODIR "/logo.jpg");
+	// show start logo
 	bool startlogo = frameBuffer->showFrame("logo.jpg");
 
 	g_RCInput = new CRCInput();