Browse Source

Removed GIT fragments

Seems that there was something wrong while merging
Dirk Eichel 12 years ago
parent
commit
443aaa30bf
1 changed files with 0 additions and 5 deletions
  1. 0
    5
      Marlin/language.h

+ 0
- 5
Marlin/language.h View File

@@ -1463,10 +1463,5 @@
1463 1463
 	#define MSG_ERR_COLD_EXTRUDE_STOP " kylmana pursotus estetty"
1464 1464
 	#define MSG_ERR_LONG_EXTRUDE_STOP " liian pitka pursotus estetty"
1465 1465
 
1466
-#endif
1467
-<<<<<<< HEAD
1468 1466
 #endif // ifndef LANGUAGE_H
1469 1467
 
1470
-=======
1471
-#endif // ifndef LANGUAGE_H
1472
->>>>>>> origin/Marlin_v1

Loading…
Cancel
Save