Browse Source

Removed GIT fragments

Seems that there was something wrong while merging
pull/1/head
Dirk Eichel 12 years ago
parent
commit
443aaa30bf
  1. 5
      Marlin/language.h

5
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

Loading…
Cancel
Save