Merge pull request #439 from STB3/Marlin-language.h-repair

Removed GIT fragments from language.h
12 years ago · 2438b34df9
parent 7f622467fc 443aaa30bf
commit 2438b34df9
1 changed files with 0 additions and 5 deletions
--- a/Marlin/language.h
+++ b/Marlin/language.h
@ -1463,10 +1463,5 @@
 	#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
 	#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"

-#endif
-<<<<<<< HEAD
 #endif // ifndef LANGUAGE_H

-=======
-#endif // ifndef LANGUAGE_H
->>>>>>> origin/Marlin_v1