From 443aaa30bf5f66a91344331f3dee64cd44464a19 Mon Sep 17 00:00:00 2001
From: Dirk Eichel <eichel@bytelink.de>
Date: Sat, 30 Mar 2013 23:26:42 +0100
Subject: [PATCH] Removed GIT fragments

Seems that there was something wrong while merging
---
 Marlin/language.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Marlin/language.h b/Marlin/language.h
index 869eb28f8..4af47f965 100644
--- 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