Skip to content
Snippets Groups Projects
Commit 443aaa30 authored by Dirk Eichel's avatar Dirk Eichel
Browse files

Removed GIT fragments 

Seems that there was something wrong while merging
parent 7f622467
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 0 additions and 5 deletions
Marlin/language.h
+ 0
− 5
View file @ 443aaa30
...@@ -1463,10 +1463,5 @@ ...@@ -1463,10 +1463,5 @@
#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty" #define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty" #define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"
#endif
<<<<<<< HEAD
#endif // ifndef LANGUAGE_H #endif // ifndef LANGUAGE_H
=======
#endif // ifndef LANGUAGE_H
>>>>>>> origin/Marlin_v1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment