q3k
/
Marlin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Removed GIT fragments from language.h
hackerspace-green
ErikZalm 2013-03-30 15:44:26 -07:00
parent 7f622467fc 443aaa30bf
commit 2438b34df9
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marlin/language.h
View File

@ -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