From 8efd4cfd730ecf9a1b1b975461b46e13839c1b07 Mon Sep 17 00:00:00 2001 From: Dirk Eichel Date: Fri, 1 Mar 2013 16:27:35 +0100 Subject: [PATCH] fixed merge conflict --- Marlin/language.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Marlin/language.h b/Marlin/language.h index 15ebb9871..697431d81 100644 --- a/Marlin/language.h +++ b/Marlin/language.h @@ -1,10 +1,12 @@ -#ifndef LANGUAGE_H + + +
#ifndef LANGUAGE_H
 #define LANGUAGE_H
 
 // NOTE: IF YOU CHANGE THIS FILE / MERGE THIS FILE WITH CHANGES
 //
-//   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" 
-//   ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
+//   ==> ALWAYS TRY TO COMPILE MARLIN WITH/WITHOUT "ULTIPANEL" / "ULTRALCD" / "SDSUPPORT" #define IN "Configuration.h" 
+//   ==> ALSO TRY ALL AVAILABLE "LANGUAGE_CHOICE" OPTIONS
 
 // Languages
 // 1  English
@@ -1462,3 +1464,4 @@
 
 #endif
 #endif // ifndef LANGUAGE_H
+
\ No newline at end of file