andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Removed GIT fragments 

Seems that there was something wrong while merging
pull/1/head
Dirk Eichel 12 years ago
parent
7f622467fc
commit
443aaa30bf
1 changed files with 0 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Marlin/language.h

5
Marlin/language.h
View File

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

Write Preview
Loading…
Cancel
Save